From 9e602e666a896d26003210674f74ab6888f476e6 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Mon, 18 Feb 2008 18:30:37 +0100
Subject: [PATCH] Update Position and Main modules.

---
 Position.ml | 37 +++++++++++++++++++++++++++++--------
 main.ml     | 31 +++++++++++++++++++++----------
 2 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/Position.ml b/Position.ml
index 0a5698e..ee853ba 100644
--- a/Position.ml
+++ b/Position.ml
@@ -1,10 +1,31 @@
-type t = {
-    mutable x : int ;
-    mutable y : int ;
-}
+(* vim: set ts=2 sw=2 et : *)
+type t = int * int
 
-let zero = { 
-    x = 0 ;
-    y = 0 ;
-}
+let zero = (0, 0);;
 
+let ( + ) x y = 
+        let (xa, xb) = x 
+        and (ya, yb) = y
+        in (xa + ya, xb + yb)
+;;
+
+let ( - ) x y =
+        let (xa, xb) = x 
+        and (ya, yb) = y
+        in (xa + ya, xb + yb)
+;;
+
+let ( * ) x y =
+        let (xa, xb) = x 
+        and (ya, yb) = y
+        in (xa * ya, xb * yb)
+;;
+
+let dot x y =
+       let (xa, xb) = x 
+       and (ya, yb) = y
+       in 
+       let na = xa * yb
+       and nb = xb * ya
+       in ( na, nb )
+;;
diff --git a/main.ml b/main.ml
index e3c3b9b..21b2fea 100644
--- a/main.ml
+++ b/main.ml
@@ -20,10 +20,12 @@ type game_event_t =
 
 
 let dispatch_status optstatus =
-  let dispatch_keypress = 
-    function
+  let dispatch_keypress key = 
+    match key with
     | 'q' -> Quit
-    | _ -> NoEvent
+    | _ -> 
+        Printf.printf "Unknown action for key (%c)\n" key; 
+        NoEvent
   in
   match optstatus with
   | None -> (* only draw *) 
@@ -41,7 +43,7 @@ let e_send chan data =
   Event.sync ( Event.send chan data ) 
 ;;
 
-let ticker pfd_out req_channel notif_channel =
+let tick_run pfd_out req_channel notif_channel =
   let buf = String.make 1 ' ' in
   while true do
     let delay = e_receive req_channel in
@@ -54,10 +56,10 @@ let ticker pfd_out req_channel notif_channel =
   done
 ;;
 
-let key_listener notif_channel =
+let graphic_run listen_lst notif_channel =
   while true do
     let event = 
-        Graphics.wait_next_event [Graphics.Key_pressed] 
+        Graphics.wait_next_event listen_lst
     in
     ignore (e_send notif_channel (Graphics_status event));
   done
@@ -67,12 +69,13 @@ let game_loop () =
   let ( pfd_out, pfd_in ) = Unix.pipe ()
   and tick_request_channel = Event.new_channel ()
   and tick_notification_channel = Event.new_channel ()
-  and key_notification_channel = Event.new_channel ()
+  and graphic_notification_channel = Event.new_channel ()
   in
-  let tick_listener = ticker pfd_out tick_request_channel 
+  let tick_listener = tick_run pfd_out tick_request_channel 
+  and graphic_listener = graphic_run [Graphics.Key_pressed]
   in
   let thr_tick =  Thread.create tick_listener tick_notification_channel
-  and thr_input = Thread.create key_listener key_notification_channel
+  and thr_input = Thread.create graphic_listener graphic_notification_channel
   in
   let ack () = 
     ignore ( Unix.write pfd_in "." 0 1 )
@@ -80,7 +83,7 @@ let game_loop () =
   let time_wait_next_event time lst = 
     e_send tick_request_channel time;
     match Event.select [Event.receive tick_notification_channel;
-                        Event.receive key_notification_channel]
+                        Event.receive graphic_notification_channel]
     with
     | Tick -> None
     | Graphics_status status -> 
@@ -94,6 +97,14 @@ let game_loop () =
     let opt_status = time_wait_next_event 0.05 [Graphics.Key_pressed]
     in
     match dispatch_status opt_status with
+    | MoveLeft -> print_string "Move Left...\n";
+    | MoveRight -> print_string "Move Right...\n";
+    | MoveUp -> print_string "Move up\n";
+    | MoveDown -> print_string "Move down\n";
+    | Action -> print_string "Action\n";
+    | ActionTwo -> print_string "ActionTwo\n";
+    | Help -> print_string "Help\n";
+    | NoEvent -> ();
     | Quit -> 
         continue := false ;
         print_string "Exiting...\n";