git-svn-id: https://spexeah.com:8443/svn/Asuro@663 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c

src/console.pas

@@ -835,7 +835,6 @@ begin
         if not UnhandledClickLeft then begin
             SelectedWindow:= WindowMask[MouseYToTile(WindowManager.MousePrev.Y)][MouseXToTile(WindowManager.MousePrev.X)];
             if (SelectedWindow <> 0) and (WindowManager.Windows[SelectedWindow] <> nil) then begin
-                //OnClickHandler(Right)
                 if (WindowManager.Z_Order[0] = SelectedWindow) or (WindowManager.Windows[SelectedWindow]^.ShellWND = false) then begin
                     if WindowManager.Windows[SelectedWindow]^.Hooks.OnMouseClick <> nil then begin
                         deltax:= MouseXToTile(WindowManager.MousePrev.X) - WindowManager.Windows[SelectedWindow]^.WND_X;

src/driver/timers/RTC.pas

@@ -29,13 +29,13 @@ var
 function weekdayToString(Weekday : uint8) : pchar;
 begin
     case Weekday of
-        0:weekdayToString:= 'Saturday';
         1:weekdayToString:= 'Sunday';
         2:weekdayToString:= 'Monday';
         3:weekdayToString:= 'Tuesday';
         4:weekdayToString:= 'Wednesday';
         5:weekdayToString:= 'Thursday';
         6:weekdayToString:= 'Friday';
+        7:weekdayToString:= 'Saturday';
         else weekdayToString:= 'Unknown';
     end;
 end;

src/include/asuro.pas

@@ -3,13 +3,17 @@ unit asuro;
 interface
  
 const
-     VERSION       = '1.0.0-661a';
+     VERSION       = '1.0.0-662a';
      VERSION_MAJOR = '1';
      VERSION_MINOR = '0';
      VERSION_SUB   = '0';
-     REVISION      = '661';
+     REVISION      = '662';
      RELEASE       = 'a';
-     LINE_COUNT    = 26884;
+     LINE_COUNT    = 26907;
+     FPC_VERSION   = '2.6.4';
+     NASM_VERSION  = '2.10.09';
+     COMPILE_DATE  = '05-05-18';
+     COMPILE_TIME  = '20:57:19';
  
 implementation
  

src/include/util.pas

@@ -39,6 +39,7 @@ procedure memset(location : uint32; value : uint8; size : uint32);
 procedure memcpy(source : uint32; dest : uint32; size : uint32);
 
 procedure printmemory(source : uint32; length : uint32; col : uint32; delim : PChar; offset_row : boolean);
+procedure printmemoryWND(source : uint32; length : uint32; col : uint32; delim : PChar; offset_row : boolean; WND : HWND);
 
 procedure halt_and_catch_fire();
 procedure halt_and_dont_catch_fire();
@@ -62,7 +63,7 @@ var
 implementation
 
 uses
-    console, RTC;
+    console, RTC, cpu;
 
 procedure sleep1;
 var
@@ -119,7 +120,7 @@ begin
     end;  
 end;
 
-procedure printmemory(source : uint32; length : uint32; col : uint32; delim : PChar; offset_row : boolean);
+procedure printmemoryWND(source : uint32; length : uint32; col : uint32; delim : PChar; offset_row : boolean; WND : HWND);
 var
     buf : puint8;
     i   : uint32;
@@ -128,21 +129,26 @@ begin
     buf:= puint8(source);
     for i:=0 to length-1 do begin
         if offset_row and (i = 0) then begin
-            console.writehex(source + (i));
-            console.writestring(': ');
+            console.writehexWND(source + (i), WND);
+            console.writestringWND(': ', WND);
         end; 
-        console.writehexpair(buf[i]);
+        console.writehexpairWND(buf[i], WND);
         if ((i+1) MOD col) = 0 then begin
-            console.writestringln(' ');  
+            console.writestringlnWND(' ', WND);  
             if offset_row then begin
-                console.writehex(source + (i + 1));
-                console.writestring(': ');
+                console.writehexWND(source + (i + 1), WND);
+                console.writestringWND(': ', WND);
             end;  
         end else begin
-            console.writestring(delim);
+            console.writestringWND(delim, WND);
         end;
     end;
-    console.writestringln(' ');   
+    console.writestringlnWND(' ', WND);   
+end;
+
+procedure printmemory(source : uint32; length : uint32; col : uint32; delim : PChar; offset_row : boolean);
+begin
+    printmemoryWND(source, length, col, delim, offset_row, 0);
 end;
 
 function hi(b : uint8) : uint8; [public, alias: 'util_hi'];

src/prog/terminal.pas

@@ -208,8 +208,17 @@ procedure version(params : PParamList);
 begin
     console.writestringWND('Asuro Version: ', TERMINAL_HWND);
     console.writestringlnWND(asuro.VERSION, TERMINAL_HWND);
-    console.writestringWND('Source Line-Count: ', TERMINAL_HWND);
-    console.writeintlnWND(LINE_COUNT, TERMINAL_HWND);
+    console.writestringWND('  Compiled on: ', TERMINAL_HWND);
+    console.writestringWND(asuro.COMPILE_DATE, TERMINAL_HWND);
+    console.writestringWND(' ', TERMINAL_HWND);
+    console.writestringlnWND(asuro.COMPILE_TIME, TERMINAL_HWND);
+    console.writestringlnWND('  Compiled With: ', TERMINAL_HWND);
+    console.writestringWND('    FPC Version: ', TERMINAL_HWND);
+    console.writestringlnWND(asuro.FPC_VERSION, TERMINAL_HWND);
+    console.writestringWND('    NASM Version: ', TERMINAL_HWND);
+    console.writestringlnWND(asuro.NASM_VERSION, TERMINAL_HWND);
+    console.writestringWND('  Source Line-Count: ', TERMINAL_HWND);
+    console.writeintlnWND(asuro.LINE_COUNT, TERMINAL_HWND);
 end;
 
 procedure help(params : PParamList);
@@ -274,17 +283,22 @@ var
 
 begin
      DateTime:= getDateTime;
+     if DateTime.Day < 10 then writeStringWND('0', TERMINAL_HWND);
      writeIntWND(DateTime.Day, TERMINAL_HWND);     
      writeStringWND('/', TERMINAL_HWND);
+     if DateTime.Month < 10 then writeStringWND('0', TERMINAL_HWND);
      writeIntWND(DateTime.Month, TERMINAL_HWND);
      writeStringWND('/', TERMINAL_HWND);  
      writeIntWND(DateTime.Century, TERMINAL_HWND);  
      writeIntWND(DateTime.Year, TERMINAL_HWND);    
      writeStringWND(' ', TERMINAL_HWND);  
+     if DateTime.Hours < 10 then writeStringWND('0', TERMINAL_HWND);
      writeIntWND(DateTime.Hours, TERMINAL_HWND);
      writeStringWND(':', TERMINAL_HWND);
+     if DateTime.Minutes < 10 then writeStringWND('0', TERMINAL_HWND);
      writeIntWND(DateTime.Minutes, TERMINAL_HWND);
      writeStringWND(':', TERMINAL_HWND);
+     if DateTime.Seconds < 10 then writeStringWND('0', TERMINAL_HWND);
      writeIntlnWND(DateTime.Seconds, TERMINAL_HWND);
      writeStringWND('Weekday: ', TERMINAL_HWND);
      writeStringlnWND(WeekdayToString(DateTime.Weekday), TERMINAL_HWND); 

versioning.sh

@@ -6,10 +6,13 @@ while IFS=: read -r line;do
 	minor=$(echo $line | awk '{print $2}')
 	sub=$(echo $line | awk '{print $3}')
 	release=$(echo $line | awk '{print $4}')
-	linecount=$(./loc.sh | awk '{print $1}')
 done <"$file"
+linecount=$(./loc.sh | awk '{print $1}')
 revision=$(svn info | grep Revision | awk '{print $2}')
-echo $major"."$minor"."$sub"-r"$revision$release
+fpcversion=$(fpc -h | grep -m 1 version | awk '{print $5}')
+nasmversion=$(nasm -v | awk '{print $3'})
+compiledate=$(date +"%d-%m-%y")
+compiletime=$(date +"%T")
 echo "unit asuro;" > $outfile
 echo " " >> $outfile
 echo "interface" >> $outfile
@@ -22,6 +25,10 @@ echo "     VERSION_SUB   = '$sub';" >> $outfile
 echo "     REVISION      = '$revision';" >> $outfile
 echo "     RELEASE       = '$release';" >> $outfile
 echo "     LINE_COUNT    = $linecount;" >> $outfile
+echo "     FPC_VERSION   = '$fpcversion';" >> $outfile
+echo "     NASM_VERSION  = '$nasmversion';" >> $outfile
+echo "     COMPILE_DATE  = '$compiledate';" >> $outfile
+echo "     COMPILE_TIME  = '$compiletime';" >> $outfile
 echo " " >> $outfile
 echo "implementation" >> $outfile
 echo " " >> $outfile