From b69f67222b55099f75a1d53082f62482c1b5c7d4 Mon Sep 17 00:00:00 2001 From: champii Date: Mon, 8 Sep 2014 16:16:21 +0200 Subject: [PATCH] added FreeCursor call --- lib/corereqs.js | 6 ++++++ lib/ext/damage.js | 32 ++++++++++++++++---------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/lib/corereqs.js b/lib/corereqs.js index 7111b03..ccd64af 100644 --- a/lib/corereqs.js +++ b/lib/corereqs.js @@ -718,6 +718,12 @@ var templates = { } ], + FreePixmap: [ + function (pixmap) { + return [ 'CxSL', [54, 2, pixmap] ]; + } + ], + CreateCursor: [ function(cid, source, mask, foreRGB, backRGB, x, y) { foreR = foreRGB.R diff --git a/lib/ext/damage.js b/lib/ext/damage.js index cdae2a4..c4aa996 100644 --- a/lib/ext/damage.js +++ b/lib/ext/damage.js @@ -3,19 +3,19 @@ var x11 = require('..'); // TODO: move to templates -exports.requireExt = function(display, callback) +exports.requireExt = function(display, callback) { var X = display.client; - X.QueryExtension('DAMAGE', function(err, ext) { + X.QueryExtension('DAMAGE', function(err, ext) { if (!ext.present) return callback(new Error('extension not available')); - ext.ReportLevel = { + ext.ReportLevel = { RawRectangles: 0, DeltaRectangles: 1, BoundingBox: 2, - NonEmpty: 3 + NonEmpty: 3 }; ext.QueryVersion = function(clientMaj, clientMin, callback) @@ -24,7 +24,7 @@ exports.requireExt = function(display, callback) X.pack_stream.pack('CCSLL', [ext.majorOpcode, 0, 3, clientMaj, clientMin]); X.replies[X.seq_num] = [ function(buf, opt) { - var res = buf.unpack('LL'); + var res = buf.unpack('LL'); return res; }, callback @@ -59,18 +59,18 @@ exports.requireExt = function(display, callback) X.pack_stream.pack('CCSLL', [ext.majorOpcode, 4, 3, damage, region]); X.pack_stream.flush(); } - + ext.QueryVersion(1, 1, function(err, vers) { ext.major = vers[0]; ext.minor = vers[1]; - callback(ext); + callback(null, ext); }); ext.events = { DamageNotify: 0 } - X.eventParsers[ext.firstEvent + ext.events.DamageNotify] = function(type, seq, extra, code, raw) + X.eventParsers[ext.firstEvent + ext.events.DamageNotify] = function(type, seq, extra, code, raw) { var event = {}; event.level = code; @@ -80,16 +80,16 @@ exports.requireExt = function(display, callback) event.damage = values[0]; event.time = values[1]; event.area = { - x: values[2], - y: values[3], - w: values[4], - h: values[5] + x: values[2], + y: values[3], + w: values[4], + h: values[5] }; event.geometry = { - x: values[6], - y: values[7], - w: values[8], - h: values[9] + x: values[6], + y: values[7], + w: values[8], + h: values[9] }; event.name = 'DamageNotify'; return event;