add experimental video widget. fix 16 colors in _attr.

This commit is contained in:
Christopher Jeffrey 2015-07-11 05:30:55 -07:00
parent cc7c9cbe03
commit baf6d2858a
5 changed files with 170 additions and 3 deletions

View File

@ -2549,12 +2549,14 @@ Program.prototype._attr = function(param, val) {
if (color < 8) { if (color < 8) {
color += 30; color += 30;
} else if (color < 16) { } else if (color < 16) {
color -= 8;
color += 90; color += 90;
} }
} else if (m[2] === 'bg') { } else if (m[2] === 'bg') {
if (color < 8) { if (color < 8) {
color += 40; color += 40;
} else if (color < 16) { } else if (color < 16) {
color -= 8;
color += 100; color += 100;
} }
} }

View File

@ -37,7 +37,8 @@ widget.classes = [
'Terminal', 'Terminal',
'Image', 'Image',
'Layout', 'Layout',
'PNG' 'PNG',
'Video'
]; ];
widget.classes.forEach(function(name) { widget.classes.forEach(function(name) {

View File

@ -197,6 +197,10 @@ Terminal.prototype.bootstrap = function() {
self.term.resize(self.width - self.iwidth, self.height - self.iheight); self.term.resize(self.width - self.iwidth, self.height - self.iheight);
}); });
this.on('destroy', function() {
self.kill();
});
if (this.handler) { if (this.handler) {
return; return;
} }
@ -206,12 +210,16 @@ Terminal.prototype.bootstrap = function() {
cols: this.width - this.iwidth, cols: this.width - this.iwidth,
rows: this.height - this.iheight, rows: this.height - this.iheight,
cwd: process.env.HOME, cwd: process.env.HOME,
env: process.env env: this.options.env || process.env
}); });
this.on('resize', function() { this.on('resize', function() {
nextTick(function() { nextTick(function() {
try {
self.pty.resize(self.width - self.iwidth, self.height - self.iheight); self.pty.resize(self.width - self.iwidth, self.height - self.iheight);
} catch (e) {
;
}
}); });
}); });
@ -379,6 +387,14 @@ Terminal.prototype.screenshot = function(xi, xl, yi, yl) {
return this.screen.screenshot(xi, xl, yi, yl, this.term); return this.screen.screenshot(xi, xl, yi, yl, this.term);
}; };
Terminal.prototype.kill = function() {
if (this.pty) {
this.pty.destroy();
this.pty.kill();
}
this.term.write('\x1b[H\x1b[2J');
};
/** /**
* Expose * Expose
*/ */

122
lib/widgets/video.js Normal file
View File

@ -0,0 +1,122 @@
/**
* video.js - video element for blessed
* Copyright (c) 2013-2015, Christopher Jeffrey and contributors (MIT License).
* https://github.com/chjj/blessed
*/
/**
* Modules
*/
var cp = require('child_process');
var nextTick = global.setImmediate || process.nextTick.bind(process);
var helpers = require('../helpers');
var Node = require('./node');
var Box = require('./box');
var Terminal = require('./terminal');
/**
* Video
*/
function Video(options) {
var self = this
, shell
, args;
if (!(this instanceof Node)) {
return new Video(options);
}
options = options || {};
Box.call(this, options);
if (this.exists('mplayer')) {
shell = 'mplayer';
args = ['-vo', 'caca', '-quiet', options.file];
} else if (this.exists('mpv')) {
shell = 'mpv';
args = ['--vo', 'caca', '--really-quiet', options.file];
} else {
this.parseTags = true;
this.setContent('{red-fg}{bold}Error:{/bold}'
+ ' mplayer or mpv not installed.{/red-fg}');
return this;
}
var opts = {
parent: this,
left: 0,
top: 0,
width: this.width - this.iwidth,
height: this.height - this.iheight,
shell: shell,
args: args.slice()
};
this.now = Date.now() / 1000 | 0;
this.start = opts.start || 0;
if (this.start) {
opts.args.unshift('--start', this.start + '');
}
var DISPLAY = process.env.DISPLAY;
delete process.env.DISPLAY;
this.tty = new Terminal(opts);
process.env.DISPLAY = DISPLAY;
this.on('click', function() {
self.tty.pty.write('p');
});
// mplayer/mpv cannot resize itself in the terminal, so we have
// to restart it at the correct start time.
this.on('resize', function() {
self.tty.destroy();
var opts = {
parent: self,
left: 0,
top: 0,
width: self.width - self.iwidth,
height: self.height - self.iheight,
shell: shell,
args: args.slice()
};
var watched = (Date.now() / 1000 | 0) - self.now;
self.now = Date.now() / 1000 | 0;
self.start += watched;
opts.args.unshift('--start', self.start + '');
var DISPLAY = process.env.DISPLAY;
delete process.env.DISPLAY;
self.tty = new Terminal(opts);
process.env.DISPLAY = DISPLAY;
self.screen.render();
});
}
Video.prototype.__proto__ = Box.prototype;
Video.prototype.type = 'video';
Video.prototype.exists = function(program) {
try {
return !!+cp.execSync('type '
+ program + ' > /dev/null 2> /dev/null'
+ ' && echo 1', { encoding: 'utf8' }).trim();
} catch (e) {
return false;
}
};
/**
* Expose
*/
module.exports = Video;

26
test/widget-video.js Normal file
View File

@ -0,0 +1,26 @@
var blessed = require('../');
var fs = require('fs');
var screen = blessed.screen({
tput: true,
smartCSR: true,
dump: __dirname + '/logs/video.log'
});
var video = blessed.video({
parent: screen,
left: 1,
top: 1,
width: '90%',
height: '90%',
border: 'line',
file: process.argv[2]
});
video.focus();
screen.render();
screen.key(['q', 'C-q', 'C-c'], function() {
process.exit(0);
});