bfg-common 1.2.210 → 1.2.212

package/public/spice-console/keymaps/scanCodeObjModifier.js

@@ -1,65 +1,65 @@
-/*
- Copyright (c) 2016 eyeOS
-
- This file is part of Open365.
-
- Open365 is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-wdi.ScanCodeObjModifier = $.spcExtend(wdi.EventObject.prototype, {
-	SHIFTDOWN: [0x2a, 0, 0, 0],
-	SHIFTUP: [0xaa, 0, 0, 0],
-
-	init: function (charObj) {
-		this.scanCodeObjProvider = new wdi.scanCodeObjProvider(charObj)
-		// this.prefix = this.scanCodeObjProvider.getPrefix();
-		// this.suffix = this.scanCodeObjProvider.getSufix();
-		this.prefix = []
-		this.suffix = []
-	},
-
-	removeShift: function () {
-		// this.prefix = this._removeKeyFromPart(this.SHIFTDOWN, this.prefix);
-		// this.scanCodeObjProvider.setPrefix(this.prefix);
-		// this.suffix = this._removeKeyFromPart(this.SHIFTUP, this.suffix);
-		// this.scanCodeObjProvider.setSuffix(this.suffix);
-
-		return this.getScanCode()
-	},
-
-	containsShiftDown: function () {
-		var found = false
-		// var self = this;
-		// _.find(this.prefix, function (item) {
-		// 	found = _.isEqual(item, self.SHIFTDOWN)
-		// });
-		return found
-	},
-	addShiftUp: function () {
-		// this.prefix.unshift(this.SHIFTUP);
-	},
-	addShiftDown: function () {
-		// this.suffix.push(this.SHIFTDOWN);
-	},
-
-	getScanCode: function () {
-		return this.scanCodeObjProvider.getScanCode()
-	},
-
-	_removeKeyFromPart: function (key, part) {
-		return part.filter(function (item) {
-			return !_.isEqual(item, key)
-		})
-	},
-})
+/*
+ Copyright (c) 2016 eyeOS
+
+ This file is part of Open365.
+
+ Open365 is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+wdi.ScanCodeObjModifier = $.spcExtend(wdi.EventObject.prototype, {
+	SHIFTDOWN: [0x2a, 0, 0, 0],
+	SHIFTUP: [0xaa, 0, 0, 0],
+
+	init: function (charObj) {
+		this.scanCodeObjProvider = new wdi.scanCodeObjProvider(charObj)
+		// this.prefix = this.scanCodeObjProvider.getPrefix();
+		// this.suffix = this.scanCodeObjProvider.getSufix();
+		this.prefix = []
+		this.suffix = []
+	},
+
+	removeShift: function () {
+		// this.prefix = this._removeKeyFromPart(this.SHIFTDOWN, this.prefix);
+		// this.scanCodeObjProvider.setPrefix(this.prefix);
+		// this.suffix = this._removeKeyFromPart(this.SHIFTUP, this.suffix);
+		// this.scanCodeObjProvider.setSuffix(this.suffix);
+
+		return this.getScanCode()
+	},
+
+	containsShiftDown: function () {
+		var found = false
+		// var self = this;
+		// _.find(this.prefix, function (item) {
+		// 	found = _.isEqual(item, self.SHIFTDOWN)
+		// });
+		return found
+	},
+	addShiftUp: function () {
+		// this.prefix.unshift(this.SHIFTUP);
+	},
+	addShiftDown: function () {
+		// this.suffix.push(this.SHIFTDOWN);
+	},
+
+	getScanCode: function () {
+		return this.scanCodeObjProvider.getScanCode()
+	},
+
+	_removeKeyFromPart: function (key, part) {
+		return part.filter(function (item) {
+			return !_.isEqual(item, key)
+		})
+	},
+})

package/public/spice-console/keymaps/scanCodeObjProvider.js

@@ -1,60 +1,60 @@
-/*
- Copyright (c) 2016 eyeOS
-
- This file is part of Open365.
-
- Open365 is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-wdi.scanCodeObjProvider = $.spcExtend(wdi.EventObject.prototype, {
-	init: function (charObj) {
-		this.charObj = charObj
-		// this.prefix = this.charObj.prefix.slice();
-		// this.suffix = this.charObj.suffix.slice();
-	},
-
-	getPrefix: function () {
-		return this.prefix
-	},
-
-	getSufix: function () {
-		return this.suffix
-	},
-
-	setPrefix: function (val) {
-		// this.prefix = val;
-	},
-	setSuffix: function (val) {
-		// this.suffix = val;
-	},
-
-	getScanCode: function () {
-		var res = []
-
-		// var prefix = this.getPrefix();
-		// if (prefix.length > 0 && prefix[0][1] !== 1) {
-		// 	res = res.concat(prefix);
-		// }
-
-		var main = this.charObj.main
-		res = res.concat(main)
-
-		// var suffix = this.getSufix();
-		// if (suffix.length > 0) {
-		// 	res = res.concat(suffix);
-		// }
-
-		return res
-	},
-})
+/*
+ Copyright (c) 2016 eyeOS
+
+ This file is part of Open365.
+
+ Open365 is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+wdi.scanCodeObjProvider = $.spcExtend(wdi.EventObject.prototype, {
+	init: function (charObj) {
+		this.charObj = charObj
+		// this.prefix = this.charObj.prefix.slice();
+		// this.suffix = this.charObj.suffix.slice();
+	},
+
+	getPrefix: function () {
+		return this.prefix
+	},
+
+	getSufix: function () {
+		return this.suffix
+	},
+
+	setPrefix: function (val) {
+		// this.prefix = val;
+	},
+	setSuffix: function (val) {
+		// this.suffix = val;
+	},
+
+	getScanCode: function () {
+		var res = []
+
+		// var prefix = this.getPrefix();
+		// if (prefix.length > 0 && prefix[0][1] !== 1) {
+		// 	res = res.concat(prefix);
+		// }
+
+		var main = this.charObj.main
+		res = res.concat(main)
+
+		// var suffix = this.getSufix();
+		// if (suffix.length > 0) {
+		// 	res = res.concat(suffix);
+		// }
+
+		return res
+	},
+})

package/public/spice-console/lib/AsyncConsumer.js

@@ -1,204 +1,204 @@
-/*
-    Copyright (c) 2016 eyeOS
-
-    This file is part of Open365.
-
-    Open365 is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-wdi.AsyncConsumer = $.spcExtend(wdi.EventObject.prototype, {
-	worker: null,
-	task: null,
-	packetWorkerIdentifier: null,
-	imageProperties: null,
-	disposed: false,
-
-	init: function(c) {
-		this.superInit();
-		this.worker = c.AsyncWorker || new wdi.AsyncWorker({
-			script: wdi.spiceClientPath + '/spice-console/application/WorkerProcess.js'
-		});
-		this.packetWorkerIdentifier = c.packetWorkerIdentifier || new wdi.PacketWorkerIdentifier();
-	},
-
-	consume: function(task) {
-		this.task = task; //store current task
-		var message = task.message;
-		var imageProperties;
-
-		//check if the packet is a type of packet that should be intercepted
-		//this doesn't mean it contains a compressed image, it means that it COULD
-		var intercept = this.packetWorkerIdentifier.shouldUseWorker(message);
-
-		if(intercept == wdi.PacketWorkerIdentifier.processingType.DECOMPRESS) {
-			//get image properties to check if there is really a compressed image
-			imageProperties = this.packetWorkerIdentifier.getImageProperties(message);
-			this.imageProperties = imageProperties;
-			//compressed images are quic and lz
-			if(imageProperties && (imageProperties.descriptor.type !=  wdi.SpiceImageType.SPICE_IMAGE_TYPE_LZ_RGB &&
-				imageProperties.descriptor.type != wdi.SpiceImageType.SPICE_IMAGE_TYPE_QUIC)) {
-
-				intercept = 0;
-			} else if(!imageProperties) {
-				intercept = 0;
-			}
-		}
-
-		//the packet is not going to be intercepted by the worker thread.
-		//mark as procssed.
-		if(intercept === 0) {
-			this.taskDone();
-			return;
-		}
-
-		var data;
-		var descriptor;
-		var opaque;
-		var brush;
-		var ret;
-		var arr;
-		var u8;
-
-		if(intercept == wdi.PacketWorkerIdentifier.processingType.DECOMPRESS) {
-			data = imageProperties.data;
-			descriptor = imageProperties.descriptor;
-			opaque = imageProperties.opaque;
-			brush = imageProperties.brush;
-
-			if(descriptor.type === wdi.SpiceImageType.SPICE_IMAGE_TYPE_LZ_RGB) {
-				var header = null;
-
-				if(!brush) { //brushes are still js arrays
-					var headerData = data.subarray(0,32).toJSArray();
-					data = data.subarray(32); //skip the header
-					header = wdi.LZSS.demarshall_rgb(headerData);
-				} else {
-					header = wdi.LZSS.demarshall_rgb(data);
-				}
-
-
-
-				arr = new ArrayBuffer(data.length+16);
-				u8 = new Uint8Array(arr);
-
-				u8[0] = 1; //LZ_RGB
-				u8[1] = opaque;
-				u8[2] = header.type;
-				u8[3] = header.top_down; //RESERVED
-
-				var number = header.width * header.height * 4;
-
-				for (var i = 0;i < 4;i++) {//iterations because of javascript number size
-					u8[4+i] = number & (255);//Get only the last byte
-					number = number >> 8;//Remove the last byte
-				}
-				var view = new DataView(arr);
-				view.setUint32(8, header.width);
-				view.setUint32(12, header.height);
-				u8.set(data, 16);
-
-				//intercept
-				//var encoded = encodeURIComponent(Base64.encode(u8.toJSArray()));
-				//$.post('record.php','data='+encoded+'&name=lz_rgba_'+encoded.length+'_'+descriptor.width+'x'+descriptor.height);
-
-				this.worker.run(arr, this._workerCompleted, {type: 'lz',top_down: header.top_down, opaque: opaque}, this);
-			} else if(descriptor.type === wdi.SpiceImageType.SPICE_IMAGE_TYPE_QUIC) {
-				var adata = new ArrayBuffer(data.length+4);
-				var view = new Uint8Array(adata);
-				view.set(data, 4);
-				view[1] = opaque?1:0;
-				view[0] = 0; //quic
-
-				//intercept
-				/*
-				var jsarray = new Uint8Array(adata);
-				var encoded = encodeURIComponent(Base64.encode(jsarray.toJSArray()));
-				var dateat = Date.now() /1000;
-				$.post('record.php','data='+encoded+'&name=quic_'+encoded.length+'_'+descriptor.width+'x'+descriptor.height);
-				*/
-
-				this.worker.run(adata, this._workerCompleted, {type: 'quic'}, this);
-			}
-		} else if(intercept == wdi.PacketWorkerIdentifier.processingType.PROCESSVIDEO) {
-			data = this.packetWorkerIdentifier.getVideoData(message);
-			arr = new ArrayBuffer(data.length+4);
-			u8 = new Uint8Array(arr);
-
-			u8[0] = 2; //2 means bytestouri
-			u8[1] = 0;
-			u8[2] = 0;
-			u8[3] = 0; //reserved
-
-			u8.set(data, 4);
-			this.worker.run(arr, function(buf, params) {
-				message.args.data = buf;
-				this.taskDone();
-			}, null, this);
-		}
-	},
-
-	//executed from webworker when processing is finished
-	_workerCompleted: function(buf, options) {
-		if(!buf) {
-			this.taskDone();
-			return;
-		}
-		var descriptor = this.imageProperties.descriptor;
-		var u8 = new Uint8ClampedArray(buf);
-		var source_img = new ImageData(u8, descriptor.width, descriptor.height);
-
-		//it is strange, but we can't use pooling on the getimagefromdata
-		//the second argument (optional) tell getimagefromdata to avoid pooling
-		var myImage = source_img;
-
-
-		if(options.type === 'lz') {
-			var top_down = options.top_down;
-			var opaque = options.opaque;
-			if(!top_down && !opaque) {
-				myImage = wdi.graphics.getImageFromData(source_img, true);
-				myImage = wdi.RasterOperation.flip(myImage);
-			}
-		}
-
-		descriptor.originalType = descriptor.type;
-		descriptor.type = wdi.SpiceImageType.SPICE_IMAGE_TYPE_CANVAS;
-
-		//replace data
-		if(this.task.message.messageType === wdi.SpiceVars.SPICE_MSG_DISPLAY_DRAW_FILL) {
-			this.task.message.args.brush.pattern.imageData = myImage;
-			this.task.message.args.brush.pattern.image.type = wdi.SpiceImageType.SPICE_IMAGE_TYPE_CANVAS;
-		} else {
-			this.task.message.args.image.data = myImage;
-		}
-		this.taskDone();
-	},
-
-	taskDone: function() {
-		this.task.state = 1;
-		this.fire('done', this);
-	},
-
-	dispose: function () {
-		if (this.disposed) return;
-		this.disposed = true;
-		this.worker.dispose();
-
-		this.worker = null;
-		this.task = null;
-		this.packetWorkerIdentifier = null;
-		this.imageProperties = null;
-
-	}
-});
+/*
+    Copyright (c) 2016 eyeOS
+
+    This file is part of Open365.
+
+    Open365 is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+wdi.AsyncConsumer = $.spcExtend(wdi.EventObject.prototype, {
+	worker: null,
+	task: null,
+	packetWorkerIdentifier: null,
+	imageProperties: null,
+	disposed: false,
+
+	init: function(c) {
+		this.superInit();
+		this.worker = c.AsyncWorker || new wdi.AsyncWorker({
+			script: wdi.spiceClientPath + '/spice-console/application/WorkerProcess.js'
+		});
+		this.packetWorkerIdentifier = c.packetWorkerIdentifier || new wdi.PacketWorkerIdentifier();
+	},
+
+	consume: function(task) {
+		this.task = task; //store current task
+		var message = task.message;
+		var imageProperties;
+
+		//check if the packet is a type of packet that should be intercepted
+		//this doesn't mean it contains a compressed image, it means that it COULD
+		var intercept = this.packetWorkerIdentifier.shouldUseWorker(message);
+
+		if(intercept == wdi.PacketWorkerIdentifier.processingType.DECOMPRESS) {
+			//get image properties to check if there is really a compressed image
+			imageProperties = this.packetWorkerIdentifier.getImageProperties(message);
+			this.imageProperties = imageProperties;
+			//compressed images are quic and lz
+			if(imageProperties && (imageProperties.descriptor.type !=  wdi.SpiceImageType.SPICE_IMAGE_TYPE_LZ_RGB &&
+				imageProperties.descriptor.type != wdi.SpiceImageType.SPICE_IMAGE_TYPE_QUIC)) {
+
+				intercept = 0;
+			} else if(!imageProperties) {
+				intercept = 0;
+			}
+		}
+
+		//the packet is not going to be intercepted by the worker thread.
+		//mark as procssed.
+		if(intercept === 0) {
+			this.taskDone();
+			return;
+		}
+
+		var data;
+		var descriptor;
+		var opaque;
+		var brush;
+		var ret;
+		var arr;
+		var u8;
+
+		if(intercept == wdi.PacketWorkerIdentifier.processingType.DECOMPRESS) {
+			data = imageProperties.data;
+			descriptor = imageProperties.descriptor;
+			opaque = imageProperties.opaque;
+			brush = imageProperties.brush;
+
+			if(descriptor.type === wdi.SpiceImageType.SPICE_IMAGE_TYPE_LZ_RGB) {
+				var header = null;
+
+				if(!brush) { //brushes are still js arrays
+					var headerData = data.subarray(0,32).toJSArray();
+					data = data.subarray(32); //skip the header
+					header = wdi.LZSS.demarshall_rgb(headerData);
+				} else {
+					header = wdi.LZSS.demarshall_rgb(data);
+				}
+
+
+
+				arr = new ArrayBuffer(data.length+16);
+				u8 = new Uint8Array(arr);
+
+				u8[0] = 1; //LZ_RGB
+				u8[1] = opaque;
+				u8[2] = header.type;
+				u8[3] = header.top_down; //RESERVED
+
+				var number = header.width * header.height * 4;
+
+				for (var i = 0;i < 4;i++) {//iterations because of javascript number size
+					u8[4+i] = number & (255);//Get only the last byte
+					number = number >> 8;//Remove the last byte
+				}
+				var view = new DataView(arr);
+				view.setUint32(8, header.width);
+				view.setUint32(12, header.height);
+				u8.set(data, 16);
+
+				//intercept
+				//var encoded = encodeURIComponent(Base64.encode(u8.toJSArray()));
+				//$.post('record.php','data='+encoded+'&name=lz_rgba_'+encoded.length+'_'+descriptor.width+'x'+descriptor.height);
+
+				this.worker.run(arr, this._workerCompleted, {type: 'lz',top_down: header.top_down, opaque: opaque}, this);
+			} else if(descriptor.type === wdi.SpiceImageType.SPICE_IMAGE_TYPE_QUIC) {
+				var adata = new ArrayBuffer(data.length+4);
+				var view = new Uint8Array(adata);
+				view.set(data, 4);
+				view[1] = opaque?1:0;
+				view[0] = 0; //quic
+
+				//intercept
+				/*
+				var jsarray = new Uint8Array(adata);
+				var encoded = encodeURIComponent(Base64.encode(jsarray.toJSArray()));
+				var dateat = Date.now() /1000;
+				$.post('record.php','data='+encoded+'&name=quic_'+encoded.length+'_'+descriptor.width+'x'+descriptor.height);
+				*/
+
+				this.worker.run(adata, this._workerCompleted, {type: 'quic'}, this);
+			}
+		} else if(intercept == wdi.PacketWorkerIdentifier.processingType.PROCESSVIDEO) {
+			data = this.packetWorkerIdentifier.getVideoData(message);
+			arr = new ArrayBuffer(data.length+4);
+			u8 = new Uint8Array(arr);
+
+			u8[0] = 2; //2 means bytestouri
+			u8[1] = 0;
+			u8[2] = 0;
+			u8[3] = 0; //reserved
+
+			u8.set(data, 4);
+			this.worker.run(arr, function(buf, params) {
+				message.args.data = buf;
+				this.taskDone();
+			}, null, this);
+		}
+	},
+
+	//executed from webworker when processing is finished
+	_workerCompleted: function(buf, options) {
+		if(!buf) {
+			this.taskDone();
+			return;
+		}
+		var descriptor = this.imageProperties.descriptor;
+		var u8 = new Uint8ClampedArray(buf);
+		var source_img = new ImageData(u8, descriptor.width, descriptor.height);
+
+		//it is strange, but we can't use pooling on the getimagefromdata
+		//the second argument (optional) tell getimagefromdata to avoid pooling
+		var myImage = source_img;
+
+
+		if(options.type === 'lz') {
+			var top_down = options.top_down;
+			var opaque = options.opaque;
+			if(!top_down && !opaque) {
+				myImage = wdi.graphics.getImageFromData(source_img, true);
+				myImage = wdi.RasterOperation.flip(myImage);
+			}
+		}
+
+		descriptor.originalType = descriptor.type;
+		descriptor.type = wdi.SpiceImageType.SPICE_IMAGE_TYPE_CANVAS;
+
+		//replace data
+		if(this.task.message.messageType === wdi.SpiceVars.SPICE_MSG_DISPLAY_DRAW_FILL) {
+			this.task.message.args.brush.pattern.imageData = myImage;
+			this.task.message.args.brush.pattern.image.type = wdi.SpiceImageType.SPICE_IMAGE_TYPE_CANVAS;
+		} else {
+			this.task.message.args.image.data = myImage;
+		}
+		this.taskDone();
+	},
+
+	taskDone: function() {
+		this.task.state = 1;
+		this.fire('done', this);
+	},
+
+	dispose: function () {
+		if (this.disposed) return;
+		this.disposed = true;
+		this.worker.dispose();
+
+		this.worker = null;
+		this.task = null;
+		this.packetWorkerIdentifier = null;
+		this.imageProperties = null;
+
+	}
+});