diff --git a/lib/corereqs.js b/lib/corereqs.js
index 72349ad..e821c3d 100644
--- a/lib/corereqs.js
+++ b/lib/corereqs.js
@@ -468,7 +468,7 @@ module.exports = {
 
    QueryPointer: [
        [ 'CxSL', [38, 2] ],
-       function(buf) {
+       function(buf, sameScreen) {
            var res = buf.unpack('LLssssS');
            return {
                root: res[0],
@@ -477,7 +477,8 @@ module.exports = {
                rootY: res[3],
                childX: res[4],
                childY: res[5],
-               keyMask: res[6]
+               keyMask: res[6],
+               sameScreen : sameScreen
            };
        }
    ],
@@ -486,13 +487,14 @@ module.exports = {
        function(srcWid, dstWid, srcX, srcY) {
            return [ 'CxSLLSS', [ 40, 4, srcWid, dstWid, srcX, srcY ] ];
        },
-       function(buf)
+       function(buf, sameScreen)
        {
            var res = buf.unpack('Lss');
            var ext = {};
            ext.child = res[0];
            ext.destX = res[1];
            ext.destY = res[2];
+           ext.sameScreen = sameScreen;
            return ext;
        }
    ],
@@ -799,7 +801,7 @@ module.exports = {
 		function(drawable){
 			return ['CxSL', [14, 2, drawable]]
 		},
-		function(buff)
+		function(buff, depth)
 		{
 			var res = buff.unpack('LssSSSx');
 			var ext = {};
@@ -809,6 +811,7 @@ module.exports = {
 			ext.width = res[3];
 			ext.height = res[4];
 			ext.borderWidth = res[5];
+			ext.depth = depth;
 			return ext;
 		}
    ],