From 6bdcd5abdfe0eb0ab1ee736003ddf68788ba02b8 Mon Sep 17 00:00:00 2001
From: malc <av1474@comtv.ru>
Date: Sun, 19 Feb 2012 15:12:25 +0400
Subject: [PATCH] Refactor

---
 main.ml |  2 +-
 wsi.ml  | 20 +++++++++++---------
 wsi.mli |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/main.ml b/main.ml
index 4b2a6de..657c174 100644
--- a/main.ml
+++ b/main.ml
@@ -5820,7 +5820,7 @@ let () =
     method key c m = keyboard c m
     method enter x y = state.mpos <- (x, y); pmotion x y
     method leave = state.mpos <- (-1, -1)
-  end);
+  end) conf.winw conf.winh;
 
   if not (
     List.exists GlMisc.check_extension
diff --git a/wsi.ml b/wsi.ml
index 8cd475c..78afa74 100644
--- a/wsi.ml
+++ b/wsi.ml
@@ -71,8 +71,8 @@ let state =
   ; fullscreen = (fun _ -> ())
   ; sock = Unix.stdin
   ; t = onot
-  ; w = 900
-  ; h = 900
+  ; w = -1
+  ; h = -1
   ; fs = false
   ; stringatom = 31
   ; parent = -1
@@ -467,7 +467,7 @@ let reshape w h =
   sendstr s state.sock;
 ;;
 
-let setup sock screennum =
+let setup sock screennum w h =
   let s = readstr sock 2 in
   let n = String.length s in
   if n != 2
@@ -525,8 +525,8 @@ let setup sock screennum =
         findscreen 0 pos
       in
       let root = r32 data pos in
-      let w = r16 data (pos+20)
-      and h = r16 data (pos+22) in
+      let rootw = r16 data (pos+20)
+      and rooth = r16 data (pos+22) in
       state.mink <- minkk;
       state.maxk <- maxkk;
       state.idbase <- idbase;
@@ -534,7 +534,7 @@ let setup sock screennum =
       vlog "screens = %d formats = %d" screens formats;
       vlog "minkk = %d maxkk = %d" minkk maxkk;
       vlog "idbase = %#x idmask = %#x" idbase idmask;
-      vlog "root=%#x %dx%d" root w h;
+      vlog "root=%#x %dx%d" root rootw rooth;
 
       let mask = 0
         + 0x00000001                    (* KeyPress *)
@@ -564,7 +564,9 @@ let setup sock screennum =
         (* + 0x01000000 *)              (* OwnerGrabButton *)
       in
       let wid = state.idbase in
-      let s = createwindowreq wid root 0 0 state.w state.h 0 mask in
+      state.w <- w;
+      state.h <- h;
+      let s = createwindowreq wid root 0 0 w h 0 mask in
       sendstr s sock;
 
       let s = mapreq wid in
@@ -670,7 +672,7 @@ let getauth haddr dnum =
   name, data;
 ;;
 
-let init t =
+let init t w h =
   let d = Sys.getenv "DISPLAY" in
   let colonpos = String.index d ':' in
   let host = String.sub d 0 colonpos in
@@ -710,7 +712,7 @@ let init t =
   w16 s 8 (String.length adata);
   sendstr s fd;
   state.sock <- fd;
-  setup fd screennum;
+  setup fd screennum w h;
   state.t <- t;
   fd;
 ;;
diff --git a/wsi.mli b/wsi.mli
index b6bcdc0..898f099 100644
--- a/wsi.mli
+++ b/wsi.mli
@@ -21,7 +21,7 @@ val setcursor : cursor -> unit;;
 val settitle : string -> unit;;
 val swapb : unit -> unit;;
 val readresp : Unix.file_descr -> unit;;
-val init : t -> Unix.file_descr;;
+val init : t -> int -> int -> Unix.file_descr;;
 val fullscreen : unit -> unit;;
 val reshape : int -> int -> unit;;
 val withalt : int -> bool;;
-- 
2.11.4.GIT