From 332ee21bda9e61a53d55a57203021d50496fb95a Mon Sep 17 00:00:00 2001
From: malc <av1474@comtv.ru>
Date: Thu, 14 Aug 2014 00:59:35 +0400
Subject: [PATCH] Allow embedding

---
 wsi.ml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wsi.ml b/wsi.ml
index 2a01f19..7e0c169 100644
--- a/wsi.ml
+++ b/wsi.ml
@@ -705,7 +705,7 @@ let syncsendintern sock secstowait s onlyifexists f =
   syncsendwithrep sock secstowait s f;
 ;;
 
-let setup sock screennum w h =
+let setup sock rootwid screennum w h =
   let s = readstr sock 2 in
   let n = String.length s in
   if n != 2
@@ -761,7 +761,7 @@ let setup sock screennum w h =
         in
         findscreen 0 pos
       in
-      let root = r32 data pos in
+      let root = if rootwid = 0 then r32 data pos else rootwid in
       let rootw = r16 data (pos+20)
       and rooth = r16 data (pos+22)
       and rootdepth = r8 data (pos+38)in
@@ -1087,7 +1087,7 @@ let getauth haddr dnum =
   | Some ic -> readauth ic
 ;;
 
-let init t w h osx =
+let init t rootwid w h osx =
   let d =
     try Sys.getenv "DISPLAY"
     with exn ->
@@ -1174,7 +1174,7 @@ let init t w h osx =
   w16 s 8 (String.length adata);
   sendstr1 s 0 (String.length s) fd;
   state.sock <- fd;
-  setup fd screennum w h;
+  setup fd rootwid screennum w h;
   state.t <- t;
   fd, state.w, state.h;
 ;;
-- 
2.11.4.GIT