dan/node-x11
1
0
Fork 0
mirror of https://github.com/danbulant/node-x11 synced 2026-06-24 17:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed unpacking Expose event

Browse source
This commit is contained in:
sidorares 2011-07-19 10:51:05 +10:00
parent 359c8205ef
commit bd7897d6b5
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/x11/xcore.js
View file

@ -57,6 +57,7 @@ function XClient(stream)
this.importRequestsFromTemplates(this, coreRequests); this.importRequestsFromTemplates(this, coreRequests);
this.startHandshake(); this.startHandshake();
// TODO: bad name
this.event_consumers = {}; // maps window id to eventemitter this.event_consumers = {}; // maps window id to eventemitter
// import available extentions // import available extentions
@ -170,13 +171,13 @@ XClient.prototype.unpackEvent = function(type, seq, extra, raw)
event.buttons = values[7]; event.buttons = values[7];
event.sameScreen = values[8]; event.sameScreen = values[8];
} else if (type == 12) { // Expose } else if (type == 12) { // Expose
var values = raw.unpack('LSSSSS'); var values = raw.unpack('SSSSS');
event.wid = values[0]; event.wid = extra;
event.x = values[1]; event.x = values[0];
event.y = values[2]; event.y = values[1];
event.width = values[3]; event.width = values[2];
event.height = values[4]; event.height = values[3];
event.count = values[5]; // TODO: ??? event.count = values[4]; // TODO: ???
} }
return event; return event;
} }
@ -219,6 +220,7 @@ XClient.prototype.expectReplyHeader = function()
var extra = res[3]; var extra = res[3];
var ev = client.unpackEvent(type, seq_num, extra, buf); var ev = client.unpackEvent(type, seq_num, extra, buf);
client.emit('event', ev); client.emit('event', ev);
console.log(ev);
var ee = client.event_consumers[ev.wid]; var ee = client.event_consumers[ev.wid];
if (ee) { if (ee) {
ee.emit('event', ev); ee.emit('event', ev);