[Mldonkey-commits] mldonkey distrib/ChangeLog src/config/mingw/mlU...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/20 01:30:19

Modified files:
        distrib        : ChangeLog 
        src/config/mingw: mlUnix.ml os_stubs_c.c 
        src/config/unix: mlUnix.ml 
        src/daemon/driver: driverInteractive.ml driverMain.ml 
        src/utils/lib  : stubs_c.c unix32.ml unix32.mli 

Log message:
        patch #4921

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.740&tr2=1.741&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/config/mingw/mlUnix.ml.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/config/mingw/os_stubs_c.c.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/config/unix/mlUnix.ml.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverMain.ml.diff?tr1=1.97&tr2=1.98&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/stubs_c.c.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/unix32.ml.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/unix32.mli.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.740 mldonkey/distrib/ChangeLog:1.741
--- mldonkey/distrib/ChangeLog:1.740    Mon Feb 20 01:17:54 2006
+++ mldonkey/distrib/ChangeLog  Mon Feb 20 01:30:19 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/02/20
+4921: MinGW: show current DL & UL stats in console title (Schlumpf)
 4909: Print warning messages when run on supported operating systems (Schlumpf)
       currently for example Windows 95/98/ME
 4920: Cleanup included header files in C code (Schlumpf)
Index: mldonkey/src/config/mingw/mlUnix.ml
diff -u mldonkey/src/config/mingw/mlUnix.ml:1.9 
mldonkey/src/config/mingw/mlUnix.ml:1.10
--- mldonkey/src/config/mingw/mlUnix.ml:1.9     Wed Dec 28 21:37:39 2005
+++ mldonkey/src/config/mingw/mlUnix.ml Mon Feb 20 01:30:19 2006
@@ -73,6 +73,7 @@
 let chroot _ = ()
 
 external set_nonblock: Unix.file_descr -> unit = "ml_set_nonblock"
+external set_console_title : string -> unit = "os_set_console_title"
 
 let mini (x: int) y = if x < y then x else y
 
Index: mldonkey/src/config/mingw/os_stubs_c.c
diff -u mldonkey/src/config/mingw/os_stubs_c.c:1.16 
mldonkey/src/config/mingw/os_stubs_c.c:1.17
--- mldonkey/src/config/mingw/os_stubs_c.c:1.16 Mon Feb 20 01:17:54 2006
+++ mldonkey/src/config/mingw/os_stubs_c.c      Mon Feb 20 01:30:19 2006
@@ -463,3 +463,19 @@
      return 1;
    }
 }
+
+/*******************************************************************
+
+
+                      os_set_console_title
+
+
+ *******************************************************************/
+
+value os_set_console_title(value buf)
+{
+   char *pbuf = String_val (buf);
+
+   SetConsoleTitle((LPCTSTR)pbuf);
+   return Val_unit;
+}
Index: mldonkey/src/config/unix/mlUnix.ml
diff -u mldonkey/src/config/unix/mlUnix.ml:1.14 
mldonkey/src/config/unix/mlUnix.ml:1.15
--- mldonkey/src/config/unix/mlUnix.ml:1.14     Sun Feb  5 13:19:14 2006
+++ mldonkey/src/config/unix/mlUnix.ml  Mon Feb 20 01:30:19 2006
@@ -111,3 +111,5 @@
       glibc_version ()
     with e -> ""
   end
+  
+let set_console_title buf = ()  (* fake function for 
DriverMain.mingw_second_timer *)
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.63 
mldonkey/src/daemon/driver/driverInteractive.ml:1.64
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.63        Mon Feb 20 
01:17:54 2006
+++ mldonkey/src/daemon/driver/driverInteractive.ml     Mon Feb 20 01:30:19 2006
@@ -951,6 +951,12 @@
   (size_of_int64 !nshared_bytes)
   (size_of_int64 !upload_counter)
 
+let console_topic () =
+  Printf.sprintf "(DL: %.1f | UL: %.1f) MLNet %s"
+    (( (float_of_int !udp_download_rate) +. (float_of_int 
!control_download_rate)) /. 1024.0)
+    (( (float_of_int !udp_upload_rate) +. (float_of_int !control_upload_rate)) 
/. 1024.0)
+    Autoconf.current_version
+
 let display_active_file_list buf o list =
   display_vd := true;
 
Index: mldonkey/src/daemon/driver/driverMain.ml
diff -u mldonkey/src/daemon/driver/driverMain.ml:1.97 
mldonkey/src/daemon/driver/driverMain.ml:1.98
--- mldonkey/src/daemon/driver/driverMain.ml:1.97       Sun Feb  5 13:17:40 2006
+++ mldonkey/src/daemon/driver/driverMain.ml    Mon Feb 20 01:30:19 2006
@@ -475,6 +475,10 @@
   add_infinite_timer 3600. hourly_timer;
   add_infinite_timer 0.1 CommonUploads.upload_download_timer;
 
+  if Autoconf.system = "mingw" then
+    add_infinite_timer 1. (fun timer ->
+        MlUnix.set_console_title (DriverInteractive.console_topic ()));
+
   List.iter
     CommonShared.shared_add_directory
   !!CommonComplexOptions.shared_directories;
@@ -606,7 +610,7 @@
         lprintf_nl () (_b "Exiting...");
         exit 73;
   end;
-  Unix32.external_start (CommonGlobals.version());
+  Unix32.external_start ();
 
   (
     let pid_filename =
Index: mldonkey/src/utils/lib/stubs_c.c
diff -u mldonkey/src/utils/lib/stubs_c.c:1.38 
mldonkey/src/utils/lib/stubs_c.c:1.39
--- mldonkey/src/utils/lib/stubs_c.c:1.38       Mon Feb 20 01:17:54 2006
+++ mldonkey/src/utils/lib/stubs_c.c    Mon Feb 20 01:30:19 2006
@@ -1147,11 +1147,6 @@
 }
 #endif  /* defined(__MINGW32__) */
 
-
-#if defined(__MINGW32__)
-static HWND myHWND = NULL;
-#endif
-
 /*******************************************************************
 
 
@@ -1161,17 +1156,19 @@
 
 *******************************************************************/
 
+#if defined(__MINGW32__)
+static HWND myHWND = NULL;
+#endif
+
 value
-external_start (value version)
+external_start (void)
 {
 
 /* Disable close button on console */
 #if defined(__MINGW32__)
   char *buf = "[MLDonkey TitleSearch]\0"; /* if multiple instances */
-  char *title = String_val (version);
   SetConsoleTitle((LPCTSTR)buf);
   myHWND = FindWindowEx(NULL, NULL, NULL, (LPCTSTR)buf);
-  SetConsoleTitle((LPCTSTR)title);
 
   if (myHWND != NULL) {
     HMENU hmenu = GetSystemMenu(myHWND, FALSE);
Index: mldonkey/src/utils/lib/unix32.ml
diff -u mldonkey/src/utils/lib/unix32.ml:1.57 
mldonkey/src/utils/lib/unix32.ml:1.58
--- mldonkey/src/utils/lib/unix32.ml:1.57       Mon Feb 20 01:17:54 2006
+++ mldonkey/src/utils/lib/unix32.ml    Mon Feb 20 01:30:19 2006
@@ -44,7 +44,7 @@
 let rw_flag =  [Unix.O_RDWR]
 let rw_creat_flag =  [Unix.O_CREAT; Unix.O_RDWR]
   
-external external_start : string -> unit = "external_start"
+external external_start : unit -> unit = "external_start"
 external external_exit : unit -> unit = "external_exit"
 external uname : unit -> string = "ml_uname"
 external os_supported : unit -> bool = "ml_os_supported"
Index: mldonkey/src/utils/lib/unix32.mli
diff -u mldonkey/src/utils/lib/unix32.mli:1.21 
mldonkey/src/utils/lib/unix32.mli:1.22
--- mldonkey/src/utils/lib/unix32.mli:1.21      Mon Feb 20 01:17:54 2006
+++ mldonkey/src/utils/lib/unix32.mli   Mon Feb 20 01:30:19 2006
@@ -21,7 +21,7 @@
 
 val verbose : bool ref
 
-val external_start : string -> unit
+val external_start : unit -> unit
 val external_exit : unit -> unit
 val uname : unit -> string
 val os_supported : unit -> bool