gpm: refactor to fit style.
This commit is contained in:
Christopher Jeffrey
parent
fae4acceef
commit
87a3d2f288
201
lib/gpmclient.js
201
lib/gpmclient.js
|
|
@ -1,30 +1,35 @@
|
|||
var net=require('net');
|
||||
var fs=require('fs');
|
||||
var EventEmitter=require('events').EventEmitter;
|
||||
var net = require('net');
|
||||
var fs = require('fs');
|
||||
var EventEmitter = require('events').EventEmitter;
|
||||
var util = require('util')
|
||||
|
||||
var GPM_USE_MAGIC=false;
|
||||
var GPM_USE_MAGIC = false;
|
||||
|
||||
var GPM_MOVE=1, GPM_DRAG=2, GPM_DOWN=4, GPM_UP=8;
|
||||
var GPM_DOUBLE=32,GPM_MFLAG=128;
|
||||
var GPM_MOVE = 1
|
||||
, GPM_DRAG = 2
|
||||
, GPM_DOWN = 4
|
||||
, GPM_UP = 8;
|
||||
|
||||
var GPM_REQ_NOPASTE=3, GPM_HARD=256;
|
||||
var GPM_DOUBLE = 32
|
||||
, GPM_MFLAG = 128;
|
||||
|
||||
var GPM_MAGIC=0x47706D4C;
|
||||
var GPM_SOCKET="/dev/gpmctl";
|
||||
var GPM_REQ_NOPASTE = 3
|
||||
, GPM_HARD = 256;
|
||||
|
||||
var GPM_MAGIC = 0x47706D4C;
|
||||
var GPM_SOCKET = '/dev/gpmctl';
|
||||
|
||||
|
||||
/*
|
||||
typedef struct Gpm_Connect {
|
||||
unsigned short eventMask, defaultMask;
|
||||
unsigned short minMod, maxMod;
|
||||
int pid;
|
||||
int vc;
|
||||
} Gpm_Connect;
|
||||
*/
|
||||
function send_config(sock, Gpm_Connect, cb) {
|
||||
// typedef struct Gpm_Connect {
|
||||
// unsigned short eventMask, defaultMask;
|
||||
// unsigned short minMod, maxMod;
|
||||
// int pid;
|
||||
// int vc;
|
||||
// } Gpm_Connect;
|
||||
|
||||
function send_config(socket, Gpm_Connect, callback) {
|
||||
if (GPM_USE_MAGIC) {
|
||||
var buffer=new Buffer(20);
|
||||
var buffer = new Buffer(20);
|
||||
buffer.writeUInt32LE(GPM_MAGIC, 0);
|
||||
buffer.writeUInt16LE(Gpm_Connect.eventMask, 4);
|
||||
buffer.writeUInt16LE(Gpm_Connect.defaultMask, 6);
|
||||
|
|
@ -33,7 +38,7 @@ function send_config(sock, Gpm_Connect, cb) {
|
|||
buffer.writeInt16LE(process.pid, 12);
|
||||
buffer.writeInt16LE(Gpm_Connect.vc, 16);
|
||||
} else {
|
||||
var buffer=new Buffer(16);
|
||||
var buffer = new Buffer(16);
|
||||
buffer.writeUInt16LE(Gpm_Connect.eventMask, 0);
|
||||
buffer.writeUInt16LE(Gpm_Connect.defaultMask, 2);
|
||||
buffer.writeUInt16LE(Gpm_Connect.minMod, 4);
|
||||
|
|
@ -41,43 +46,42 @@ function send_config(sock, Gpm_Connect, cb) {
|
|||
buffer.writeInt16LE(Gpm_Connect.pid, 8);
|
||||
buffer.writeInt16LE(Gpm_Connect.vc, 12);
|
||||
}
|
||||
sock.write(buffer, function () {
|
||||
if (cb) cb();
|
||||
socket.write(buffer, function() {
|
||||
if (callback) callback();
|
||||
});
|
||||
}
|
||||
|
||||
/*
|
||||
typedef struct Gpm_Event {
|
||||
unsigned char buttons, modifiers; // try to be a multiple of 4
|
||||
unsigned short vc;
|
||||
short dx, dy, x, y; // displacement x,y for this event, and absolute x,y
|
||||
enum Gpm_Etype type;
|
||||
// clicks e.g. double click are determined by time-based processing
|
||||
int clicks;
|
||||
enum Gpm_Margin margin;
|
||||
// wdx/y: displacement of wheels in this event. Absolute values are not
|
||||
// required, because wheel movement is typically used for scrolling
|
||||
// or selecting fields, not for cursor positioning. The application
|
||||
// can determine when the end of file or form is reached, and not
|
||||
// go any further.
|
||||
// A single mouse will use wdy, "vertical scroll" wheel.
|
||||
short wdx, wdy;
|
||||
} Gpm_Event;
|
||||
*/
|
||||
// typedef struct Gpm_Event {
|
||||
// unsigned char buttons, modifiers; // try to be a multiple of 4
|
||||
// unsigned short vc;
|
||||
// short dx, dy, x, y; // displacement x,y for this event, and absolute x,y
|
||||
// enum Gpm_Etype type;
|
||||
// // clicks e.g. double click are determined by time-based processing
|
||||
// int clicks;
|
||||
// enum Gpm_Margin margin;
|
||||
// // wdx/y: displacement of wheels in this event. Absolute values are not
|
||||
// // required, because wheel movement is typically used for scrolling
|
||||
// // or selecting fields, not for cursor positioning. The application
|
||||
// // can determine when the end of file or form is reached, and not
|
||||
// // go any further.
|
||||
// // A single mouse will use wdy, "vertical scroll" wheel.
|
||||
// short wdx, wdy;
|
||||
// } Gpm_Event;
|
||||
|
||||
function parseEvent(raw) {
|
||||
var evnt={};
|
||||
evnt.buttons=raw[0];
|
||||
evnt.modifiers=raw[1];
|
||||
evnt.vc=raw.readUInt16LE(2);
|
||||
evnt.dx=raw.readInt16LE(4);
|
||||
evnt.dy=raw.readInt16LE(6);
|
||||
evnt.x=raw.readInt16LE(8);
|
||||
evnt.y=raw.readInt16LE(10);
|
||||
evnt.type=raw.readInt16LE(12);
|
||||
evnt.clicks=raw.readInt32LE(16);
|
||||
evnt.margin=raw.readInt32LE(20);
|
||||
evnt.wdx=raw.readInt16LE(24);
|
||||
evnt.wdy=raw.readInt16LE(26);
|
||||
var evnt = {};
|
||||
evnt.buttons = raw[0];
|
||||
evnt.modifiers = raw[1];
|
||||
evnt.vc = raw.readUInt16LE(2);
|
||||
evnt.dx = raw.readInt16LE(4);
|
||||
evnt.dy = raw.readInt16LE(6);
|
||||
evnt.x = raw.readInt16LE(8);
|
||||
evnt.y = raw.readInt16LE(10);
|
||||
evnt.type = raw.readInt16LE(12);
|
||||
evnt.clicks = raw.readInt32LE(16);
|
||||
evnt.margin = raw.readInt32LE(20);
|
||||
evnt.wdx = raw.readInt16LE(24);
|
||||
evnt.wdy = raw.readInt16LE(26);
|
||||
return evnt;
|
||||
}
|
||||
|
||||
|
|
@ -88,106 +92,119 @@ function GpmClient(options) {
|
|||
|
||||
EventEmitter.call(this);
|
||||
|
||||
var pid=process.pid;
|
||||
var pid = process.pid;
|
||||
|
||||
// check tty for /dev/tty[n]
|
||||
var tty=/tty[0-9]+$/.exec(fs.readlinkSync('/proc/'+pid+'/fd/0'));
|
||||
var tty = /tty[0-9]+$/.exec(fs.readlinkSync('/proc/' + pid + '/fd/0'));
|
||||
if (tty === null) {
|
||||
//TODO: should also check for /dev/input/..
|
||||
// TODO: should also check for /dev/input/..
|
||||
}
|
||||
|
||||
var vc;
|
||||
if (tty) {
|
||||
var tty=tty[0];
|
||||
vc=/[0-9]+$/.exec(tty)[0];
|
||||
var tty = tty[0];
|
||||
vc = /[0-9]+$/.exec(tty)[0];
|
||||
}
|
||||
|
||||
var self=this;
|
||||
var self = this;
|
||||
|
||||
if (tty) {
|
||||
fs.stat(GPM_SOCKET, function(err, stat) {
|
||||
if (err || !stat.isSocket())
|
||||
if (err || !stat.isSocket()) {
|
||||
return;
|
||||
}
|
||||
|
||||
var conf = {
|
||||
eventMask: 0xffff,
|
||||
defaultMask: GPM_MOVE|GPM_HARD,
|
||||
defaultMask: GPM_MOVE | GPM_HARD,
|
||||
minMod: 0,
|
||||
maxMod: 0xffff,
|
||||
pid: pid,
|
||||
vc: vc
|
||||
};
|
||||
|
||||
var gpm=net.createConnection(GPM_SOCKET);
|
||||
this.gpm=gpm;
|
||||
var gpm = net.createConnection(GPM_SOCKET);
|
||||
this.gpm = gpm;
|
||||
|
||||
gpm.on('connect', function() {
|
||||
send_config(gpm, conf, function() {
|
||||
conf.pid=0;
|
||||
conf.vc=GPM_REQ_NOPASTE;
|
||||
conf.pid = 0;
|
||||
conf.vc = GPM_REQ_NOPASTE;
|
||||
//send_config(gpm, conf);
|
||||
});
|
||||
});
|
||||
|
||||
gpm.on('data', function(packet) {
|
||||
var evnt=parseEvent(packet);
|
||||
switch(evnt.type & 15) {
|
||||
var evnt = parseEvent(packet);
|
||||
switch (evnt.type & 15) {
|
||||
case GPM_MOVE:
|
||||
if (evnt.dx || evnt.dy) self.emit('move', evnt.buttons, evnt.modifiers, evnt.x, evnt.y)
|
||||
if (evnt.wdx || evnt.wdy) self.emit('mousewheel', evnt.buttons, evnt.modifiers, evnt.x, evnt.y, evnt.wdx, evnt.wdy)
|
||||
if (evnt.dx || evnt.dy) {
|
||||
self.emit('move', evnt.buttons, evnt.modifiers, evnt.x, evnt.y);
|
||||
}
|
||||
if (evnt.wdx || evnt.wdy) {
|
||||
self.emit('mousewheel',
|
||||
evnt.buttons, evnt.modifiers,
|
||||
evnt.x, evnt.y, evnt.wdx, evnt.wdy);
|
||||
}
|
||||
break;
|
||||
case GPM_DRAG:
|
||||
if (evnt.dx || evnt.dy) self.emit('drag', evnt.buttons, evnt.modifiers, evnt.x, evnt.y)
|
||||
if (evnt.wdx || evnt.wdy) self.emit('mousewheel', evnt.buttons, evnt.modifiers, evnt.x, evnt.y, evnt.wdx, evnt.wdy)
|
||||
if (evnt.dx || evnt.dy) {
|
||||
self.emit('drag', evnt.buttons, evnt.modifiers, evnt.x, evnt.y);
|
||||
}
|
||||
if (evnt.wdx || evnt.wdy) {
|
||||
self.emit('mousewheel',
|
||||
evnt.buttons, evnt.modifiers,
|
||||
evnt.x, evnt.y, evnt.wdx, evnt.wdy);
|
||||
}
|
||||
break;
|
||||
case GPM_DOWN:
|
||||
self.emit('btndown', evnt.buttons, evnt.modifiers, evnt.x, evnt.y)
|
||||
self.emit('btndown', evnt.buttons, evnt.modifiers, evnt.x, evnt.y);
|
||||
if (evnt.type & GPM_DOUBLE) {
|
||||
self.emit('dblclick', evnt.buttons, evnt.modifiers, evnt.x, evnt.y)
|
||||
self.emit('dblclick', evnt.buttons, evnt.modifiers, evnt.x, evnt.y);
|
||||
}
|
||||
break;
|
||||
case GPM_UP:
|
||||
self.emit('btnup', evnt.buttons, evnt.modifiers, evnt.x, evnt.y)
|
||||
self.emit('btnup', evnt.buttons, evnt.modifiers, evnt.x, evnt.y);
|
||||
if (!(evnt.type & GPM_MFLAG)) {
|
||||
self.emit('click', evnt.buttons, evnt.modifiers, evnt.x, evnt.y)
|
||||
self.emit('click', evnt.buttons, evnt.modifiers, evnt.x, evnt.y);
|
||||
}
|
||||
break;
|
||||
}
|
||||
})
|
||||
});
|
||||
gpm.on('error', function(err) {
|
||||
console.log('GPM ERROR', err);
|
||||
// console.log('GPM ERROR', err);
|
||||
self.stop();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
GpmClient.prototype=new EventEmitter();
|
||||
GpmClient.prototype.__proto__ = EventEmitter.prototype;
|
||||
|
||||
GpmClient.prototype.stop=function() {
|
||||
if (this.gpm) this.gpm.end();
|
||||
GpmClient.prototype.stop = function() {
|
||||
if (this.gpm) {
|
||||
this.gpm.end();
|
||||
}
|
||||
delete this.gpm;
|
||||
}
|
||||
};
|
||||
|
||||
GpmClient.prototype.ButtonName = function(btn) {
|
||||
if (btn & 4) return 'left';
|
||||
if (btn & 2) return 'middle';
|
||||
if (btn & 1) return 'right';
|
||||
return ''
|
||||
}
|
||||
return '';
|
||||
};
|
||||
|
||||
GpmClient.prototype.hasShiftKey = function(mod) {
|
||||
return (mod & 1) ? true:false;
|
||||
}
|
||||
return (mod & 1) ? true : false;
|
||||
};
|
||||
|
||||
GpmClient.prototype.hasCtrlKey = function(mod) {
|
||||
return (mod & 4) ? true:false;
|
||||
}
|
||||
return (mod & 4) ? true : false;
|
||||
};
|
||||
|
||||
GpmClient.prototype.hasMetaKey = function(mod) {
|
||||
return (mod & 8) ? true:false;
|
||||
}
|
||||
return (mod & 8) ? true : false;
|
||||
};
|
||||
|
||||
|
||||
module.exports=GpmClient;
|
||||
module.exports = GpmClient;
|
||||
|
|
|
|||
111
lib/program.js
111
lib/program.js
|
|
@ -635,76 +635,100 @@ Program.prototype._bindMouse = function(s, buf) {
|
|||
|
||||
/* gpm support for linux vc */
|
||||
Program.prototype.enableGpm = function() {
|
||||
var gpmclient=require('./gpmclient')
|
||||
this.gpm=gpmclient();
|
||||
var self=this;
|
||||
this.gpm.on('btndown', function(btn,modifier, x, y) {
|
||||
var self = this;
|
||||
var gpmclient = require('./gpmclient')
|
||||
|
||||
this.gpm = gpmclient();
|
||||
|
||||
this.gpm.on('btndown', function(btn, modifier, x, y) {
|
||||
x--, y--;
|
||||
var key={
|
||||
name: 'mouse', type: 'GPM',
|
||||
|
||||
var key = {
|
||||
name: 'mouse',
|
||||
type: 'GPM',
|
||||
action: 'mousedown',
|
||||
button: self.gpm.ButtonName(btn),
|
||||
raw: [btn,modifier, x, y],
|
||||
x: x, y: y,
|
||||
x: x,
|
||||
y: y,
|
||||
shift: self.gpm.hasShiftKey(modifier),
|
||||
meta: self.gpm.hasMetaKey(modifier),
|
||||
ctrl: self.gpm.hasCtrlKey(modifier)
|
||||
};
|
||||
|
||||
self.emit('keypress', null, key);
|
||||
self.emit('mouse', key);
|
||||
});
|
||||
this.gpm.on('btnup', function(btn,modifier, x, y) {
|
||||
|
||||
this.gpm.on('btnup', function(btn, modifier, x, y) {
|
||||
x--, y--;
|
||||
var key={
|
||||
name: 'mouse', type: 'GPM',
|
||||
|
||||
var key = {
|
||||
name: 'mouse',
|
||||
type: 'GPM',
|
||||
action: 'mouseup',
|
||||
button: self.gpm.ButtonName(btn),
|
||||
raw: [btn,modifier, x, y],
|
||||
x: x, y: y,
|
||||
x: x,
|
||||
y: y,
|
||||
shift: self.gpm.hasShiftKey(modifier),
|
||||
meta: self.gpm.hasMetaKey(modifier),
|
||||
ctrl: self.gpm.hasCtrlKey(modifier)
|
||||
};
|
||||
|
||||
self.emit('keypress', null, key);
|
||||
self.emit('mouse', key);
|
||||
});
|
||||
this.gpm.on('move', function(btn,modifier, x, y) {
|
||||
|
||||
this.gpm.on('move', function(btn, modifier, x, y) {
|
||||
x--, y--;
|
||||
var key={
|
||||
name: 'mouse', type: 'GPM',
|
||||
|
||||
var key = {
|
||||
name: 'mouse',
|
||||
type: 'GPM',
|
||||
action: 'mousemove',
|
||||
button: self.gpm.ButtonName(btn),
|
||||
raw: [btn,modifier, x, y],
|
||||
x: x, y: y,
|
||||
x: x,
|
||||
y: y,
|
||||
shift: self.gpm.hasShiftKey(modifier),
|
||||
meta: self.gpm.hasMetaKey(modifier),
|
||||
ctrl: self.gpm.hasCtrlKey(modifier)
|
||||
};
|
||||
|
||||
self.emit('keypress', null, key);
|
||||
self.emit('mouse', key);
|
||||
});
|
||||
this.gpm.on('drag', function(btn,modifier, x, y) {
|
||||
|
||||
this.gpm.on('drag', function(btn, modifier, x, y) {
|
||||
x--, y--;
|
||||
var key={
|
||||
name: 'mouse', type: 'GPM',
|
||||
|
||||
var key = {
|
||||
name: 'mouse',
|
||||
type: 'GPM',
|
||||
action: 'mousemove',
|
||||
button: self.gpm.ButtonName(btn),
|
||||
raw: [btn,modifier, x, y],
|
||||
x: x, y: y,
|
||||
x: x,
|
||||
y: y,
|
||||
shift: self.gpm.hasShiftKey(modifier),
|
||||
meta: self.gpm.hasMetaKey(modifier),
|
||||
ctrl: self.gpm.hasCtrlKey(modifier)
|
||||
};
|
||||
|
||||
self.emit('keypress', null, key);
|
||||
self.emit('mouse', key);
|
||||
});
|
||||
this.gpm.on('mousewheel', function(btn,modifier, x, y, dx, dy) {
|
||||
var key={
|
||||
name: 'mouse', type: 'GPM',
|
||||
action: dy>0? 'wheelup':'wheeldown',
|
||||
|
||||
this.gpm.on('mousewheel', function(btn, modifier, x, y, dx, dy) {
|
||||
var key = {
|
||||
name: 'mouse',
|
||||
type: 'GPM',
|
||||
action: dy > 0 ? 'wheelup':'wheeldown',
|
||||
button: self.gpm.ButtonName(btn),
|
||||
raw: [btn,modifier, x, y, dx, dy],
|
||||
x: x, y: y,
|
||||
x: x,
|
||||
y: y,
|
||||
shift: self.gpm.hasShiftKey(modifier),
|
||||
meta: self.gpm.hasMetaKey(modifier),
|
||||
ctrl: self.gpm.hasCtrlKey(modifier)
|
||||
|
|
@ -722,7 +746,6 @@ Program.prototype.disableGpm = function() {
|
|||
}
|
||||
};
|
||||
|
||||
|
||||
// All possible responses from the terminal
|
||||
Program.prototype.bindResponse = function() {
|
||||
if (this._boundResponse) return;
|
||||
|
|
@ -2751,36 +2774,42 @@ Program.prototype.normalBuffer = function() {
|
|||
};
|
||||
|
||||
Program.prototype.enableMouse = function() {
|
||||
console.log(process.env.BLESSED_FORCE_MODES);
|
||||
if (process.env.BLESSED_FORCE_MODES) {
|
||||
var modes=process.env.BLESSED_FORCE_MODES.split(',');
|
||||
var options={};
|
||||
for (var n=0; n<modes.length; ++n) {
|
||||
var mds=modes[n].split('=');
|
||||
var v=mds[1]=='0' ? false : true;
|
||||
switch(mds[0].toUpperCase()) {
|
||||
var modes = process.env.BLESSED_FORCE_MODES.split(',');
|
||||
var options = {};
|
||||
for (var n = 0; n < modes.length; ++n) {
|
||||
var pair = modes[n].split('=');
|
||||
var v = pair[1] !== '0';
|
||||
switch (pair[0].toUpperCase()) {
|
||||
case 'SGRMOUSE':
|
||||
options.sgrMouse=v; break;
|
||||
options.sgrMouse = v;
|
||||
break;
|
||||
case 'UTFMOUSE':
|
||||
options.utfMouse=v; break;
|
||||
options.utfMouse = v;
|
||||
break;
|
||||
case 'VT200MOUSE':
|
||||
options.vt200Mouse=v; break;
|
||||
options.vt200Mouse = v;
|
||||
break;
|
||||
case 'URXVTMOUSE':
|
||||
options.urxvtMouse=true; break;
|
||||
options.urxvtMouse = v;
|
||||
break;
|
||||
case 'X10MOUSE':
|
||||
options.x10Mouse=true; break;
|
||||
options.x10Mouse = v;
|
||||
break;
|
||||
case 'GPMMOUSE':
|
||||
this.enableGpm();
|
||||
break;
|
||||
case 'CELLMOTION':
|
||||
options.cellMotion=v; break;
|
||||
options.cellMotion = v;
|
||||
break;
|
||||
case 'ALLMOTION':
|
||||
options.allMotion=v; break;
|
||||
options.allMotion = v;
|
||||
break;
|
||||
case 'SENDFOCUS':
|
||||
options.sendFocus=v; break;
|
||||
options.sendFocus = v;
|
||||
break;
|
||||
}
|
||||
}
|
||||
console.log(options);
|
||||
return this.setMouse(options, true);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue