[pspplayer commit] r589 - in trunk: Noxa.Emulation.Psp.Player Noxa.Emulation.Psp.Player/Debugger/Tools Noxa.Emulatio...

[codesite...@google.com]

Author: ben.vanik
Date: Sun Mar 23 21:30:36 2008
New Revision: 589

Added:
trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogControl.Designer.cs
trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogControl.cs
Modified:
trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogTool.Designer.cs
trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogTool.cs
trunk/Noxa.Emulation.Psp.Player/Noxa.Emulation.Psp.Player.csproj
trunk/Noxa.Emulation.Psp.Video.ManagedGL/MGLDriver.Worker.cs

Log:
simple log display for rick ;)
no clipboard, no filtering, and not pretty, but it is fast

Added: trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogControl.Designer.cs
==============================================================================
--- (empty file)
+++ trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogControl.Designer.cs Sun Mar 23 21:30:36 2008
@@ -0,0 +1,36 @@
+namespace Noxa.Emulation.Psp.Player.Debugger.Tools
+{
+ partial class LogControl
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose( bool disposing )
+ {
+ if( disposing && ( components != null ) )
+ {
+ components.Dispose();
+ }
+ base.Dispose( disposing );
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ components = new System.ComponentModel.Container();
+ }
+
+ #endregion
+ }
+}

Added: trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogControl.cs
==============================================================================
--- (empty file)
+++ trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogControl.cs Sun Mar 23 21:30:36 2008
@@ -0,0 +1,374 @@
+// ----------------------------------------------------------------------------
+// PSP Player Emulation Suite
+// Copyright (C) 2008 Ben Vanik (noxa)
+// Licensed under the LGPL - see License.txt in the project root for details
+// ----------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Threading;
+using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
+
+namespace Noxa.Emulation.Psp.Player.Debugger.Tools
+{
+ public partial class LogControl : Control
+ {
+ class LogLine
+ {
+ public readonly Verbosity Verbosity;
+ public readonly Feature Feature;
+ public readonly string Value;
+ public LogLine( Verbosity verbosity, Feature feature, string value )
+ {
+ this.Verbosity = verbosity;
+ this.Feature = feature;
+ this.Value = value;
+ }
+ }
+
+ private VScrollBar _verticalScrollBar;
+
+ private List<LogLine> _lines = new List<LogLine>( 20000 );
+ private int _firstVisibleLine;
+ private int _lastVisibleLine;
+ private int _visibleLines;
+
+ public LogControl()
+ {
+ this.InitializeComponent();
+
+ this.SetStyle( ControlStyles.UserPaint, true );
+ this.SetStyle( ControlStyles.AllPaintingInWmPaint, true );
+ this.SetStyle( ControlStyles.ResizeRedraw, true );
+ this.SetStyle( ControlStyles.Opaque, true );
+ this.SetStyle( ControlStyles.OptimizedDoubleBuffer, true );
+
+ _verticalScrollBar = new VScrollBar();
+ _verticalScrollBar.Scroll += new ScrollEventHandler( _verticalScrollBar_Scroll );
+ _verticalScrollBar.Dock = DockStyle.Right;
+ _verticalScrollBar.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Right;
+ _verticalScrollBar.Left = this.ClientSize.Width - 2 - _verticalScrollBar.Width;
+ _verticalScrollBar.Top = 2;
+ _verticalScrollBar.Height = this.ClientSize.Height - 4;
+ this.Controls.Add( _verticalScrollBar );
+
+ this.SetupGraphics();
+ this.CalculateSize( true );
+ }
+
+ private int _pendingUpdates;
+
+ public void AddLine( Verbosity verbosity, Feature feature, string value )
+ {
+ LogLine line = new LogLine( verbosity, feature, value );
+ lock( _lines )
+ _lines.Add( line );
+ if( Interlocked.Increment( ref _pendingUpdates ) > 1 )
+ return;
+ this.BeginInvoke( ( SafeAddLineDelegate )this.SafeAddLine, line );
+ }
+
+ private delegate void SafeAddLineDelegate( LogLine line );
+ private void SafeAddLine( LogLine line )
+ {
+ _pendingUpdates = 0;
+
+ lock( _lines )
+ _lines.Add( line );
+
+ this.CalculateSize( false );
+
+ // if autoscroll
+ if( true )
+ {
+ this.ScrollToLine( Math.Max( 0, _lines.Count - _visibleLines ) );
+ }
+ }
+
+ #region Sizing
+
+ protected override void OnResize( EventArgs e )
+ {
+ base.OnResize( e );
+
+ this.CalculateSize( true );
+ }
+
+ private void CalculateSize( bool invalidate )
+ {
+ _verticalScrollBar.Minimum = 0;
+ _verticalScrollBar.Maximum = _lines.Count + 1;
+ _visibleLines = ( int )Math.Ceiling( ( double )( this.ClientRectangle.Height / _lineHeight ) );
+
+ if( this.UpdateVisibleLines() == true )
+ {
+ if( invalidate == true )
+ this.Invalidate();
+ }
+ }
+
+ #endregion
+
+ #region Focus/Input
+
+ protected override void OnMouseDown( MouseEventArgs e )
+ {
+ base.OnMouseDown( e );
+ this.Focus();
+ }
+
+ #endregion
+
+ #region Scrolling/navigation
+
+ private int _scrollLine;
+
+ private bool ScrollToLine( int targetLine )
+ {
+ if( _scrollLine == targetLine )
+ return false;
+ _scrollLine = targetLine;
+ if( _verticalScrollBar.Maximum < _lines.Count )
+ _verticalScrollBar.Maximum = _lines.Count;
+ _verticalScrollBar.Value = targetLine;
+ if( this.UpdateVisibleLines() == true )
+ {
+ _verticalScrollBar.Invalidate();
+ this.Invalidate();
+ }
+ return true;
+ }
+
+ private void _verticalScrollBar_Scroll( object sender, ScrollEventArgs e )
+ {
+ int targetLine = _firstVisibleLine;
+ switch( e.Type )
+ {
+ case ScrollEventType.First:
+ targetLine = 0;
+ break;
+ case ScrollEventType.Last:
+ targetLine = _lines.Count - _visibleLines;
+ break;
+ case ScrollEventType.LargeDecrement:
+ targetLine = Math.Max( 0, targetLine - _visibleLines - 4 );
+ break;
+ case ScrollEventType.LargeIncrement:
+ targetLine = Math.Min( _lines.Count - _visibleLines, targetLine + _visibleLines - 4 );
+ break;
+ case ScrollEventType.SmallDecrement:
+ if( targetLine > 0 )
+ targetLine--;
+ break;
+ case ScrollEventType.SmallIncrement:
+ if( targetLine < ( _lines.Count - _visibleLines ) )
+ targetLine++;
+ break;
+ case ScrollEventType.ThumbPosition:
+ targetLine = e.NewValue;
+ break;
+ case ScrollEventType.ThumbTrack:
+ targetLine = e.NewValue;
+ break;
+ }
+
+ e.NewValue = targetLine;
+ this.ScrollToLine( targetLine );
+ }
+
+ protected override void OnMouseWheel( MouseEventArgs e )
+ {
+ base.OnMouseWheel( e );
+
+ int targetLine = _firstVisibleLine;
+ int units = Math.Min( 1, e.Delta / SystemInformation.MouseWheelScrollDelta );
+ if( ( Control.ModifierKeys & Keys.Shift ) == Keys.Shift )
+ targetLine -= ( units * ( _visibleLines - 4 ) );
+ else
+ targetLine -= ( units * SystemInformation.MouseWheelScrollLines );
+ targetLine = Math.Max( Math.Min( targetLine, _lines.Count - 1 ), 0 );
+
+ this.ScrollToLine( targetLine );
+ }
+
+ protected override void OnKeyDown( KeyEventArgs e )
+ {
+ int targetLine = _firstVisibleLine;
+ switch( e.KeyCode )
+ {
+ case Keys.Home:
+ if( ( Control.ModifierKeys & Keys.Control ) == Keys.Control )
+ targetLine = 0;
+ else
+ {
+ // TODO: jump to current method top
+ }
+ break;
+ case Keys.End:
+ if( ( Control.ModifierKeys & Keys.Control ) == Keys.Control )
+ targetLine = _lines.Count - _visibleLines;
+ else
+ {
+ // TODO: jump to current method bottom
+ }
+ break;
+ case Keys.PageUp:
+ targetLine = Math.Max( 0, targetLine - _visibleLines - 4 );
+ break;
+ case Keys.PageDown:
+ targetLine = Math.Min( _lines.Count - _visibleLines, targetLine + _visibleLines - 4 );
+ break;
+ case Keys.Up:
+ if( targetLine > 0 )
+ targetLine--;
+ break;
+ case Keys.Down:
+ if( targetLine < ( _lines.Count - _visibleLines ) )
+ targetLine++;
+ break;
+ }
+
+ if( this.ScrollToLine( targetLine ) == true )
+ {
+ e.Handled = true;
+ return;
+ }
+
+ base.OnKeyDown( e );
+ }
+
+ private bool UpdateVisibleLines()
+ {
+ int firstVisibleLine = _scrollLine;
+ int lastVisibleLine = Math.Min( _lines.Count - 1, firstVisibleLine + _visibleLines );
+ if( ( firstVisibleLine != _firstVisibleLine ) || ( lastVisibleLine != _lastVisibleLine ) )
+ {
+ _firstVisibleLine = firstVisibleLine;
+ _lastVisibleLine = lastVisibleLine;
+ return true;
+ }
+ else
+ return false;
+ }
+
+ #endregion
+
+ #region Painting
+
+ internal Font _font = new Font( "Courier New", 8.0f, FontStyle.Regular );
+ //internal Font _font = new Font( "Consolas", 8.0f, FontStyle.Bold );
+ internal Brush _valueFontBrush = SystemBrushes.ControlText;
+ internal Brush _disabledFontBrush = SystemBrushes.GrayText;
+
+ // Critical = 0, Normal = 1, Verbose = 2
+ internal Brush[] _labelFontBrushes = new Brush[] { Brushes.Red, Brushes.Black, Brushes.Green };
+
+ private StringFormat _stringFormat;
+ private SizeF _charSize;
+ private int _lineSpacing;
+ private int _lineHeight;
+
+ private Pen _vertGridPen;
+ private Brush _labelBrush;
+ private Brush _valueBrush;
+ private Brush _disabledBrush;
+
+ private int _labelWidth = 100;
+
+ private void SetupGraphics()
+ {
+ using( Graphics g = Graphics.FromHwnd( this.Handle ) )
+ {
+ g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit;
+ _charSize = g.MeasureString( "00000000", _font, 100, _stringFormat );
+ }
+ _charSize.Width /= 8.0f;
+
+ _stringFormat = new StringFormat( StringFormat.GenericTypographic );
+ _stringFormat.FormatFlags = StringFormatFlags.MeasureTrailingSpaces;
+ _lineSpacing = 0;
+ _lineHeight = ( int )( _charSize.Height + _lineSpacing + 0.5f );
+
+ _vertGridPen = SystemPens.ControlLight;
+
+ Color c = SystemColors.ControlLight;
+ Color lightest = Color.FromArgb(
+ Math.Min( c.R + 20, 255 ),
+ Math.Min( c.G + 20, 255 ),
+ Math.Min( c.B + 20, 255 ) );
+ Color light = Color.FromArgb(
+ Math.Min( c.R + 25, 255 ),
+ Math.Min( c.G + 25, 255 ),
+ Math.Min( c.B + 25, 255 ) );
+ _labelBrush = new SolidBrush( light );
+ _valueBrush = SystemBrushes.Window;
+ _disabledBrush = new SolidBrush( light );
+
+ _labelWidth = ( int )( _charSize.Width * 10 + 2 + 0.5f );
+ }
+
+ protected override void OnPaintBackground( PaintEventArgs e )
+ {
+ Brush backBrush = ( this.Enabled == true ) ? _valueBrush : _disabledBrush;
+
+ if( TextBoxRenderer.IsSupported )
+ {
+ VisualStyleElement state = ( this.Enabled == true ) ? VisualStyleElement.TextBox.TextEdit.Normal : VisualStyleElement.TextBox.TextEdit.Disabled;
+ VisualStyleRenderer vsr = new VisualStyleRenderer( state );
+ vsr.DrawBackground( e.Graphics, this.ClientRectangle );
+
+ Rectangle rectContent = vsr.GetBackgroundContentRectangle( e.Graphics, this.ClientRectangle );
+ e.Graphics.FillRectangle( backBrush, rectContent );
+ this.DrawShared( e );
+ }
+ else
+ {
+ e.Graphics.FillRectangle( backBrush, this.ClientRectangle );
+ this.DrawShared( e );
+
+ ControlPaint.DrawBorder3D( e.Graphics, this.ClientRectangle, Border3DStyle.Sunken );
+ }
+ }
+
+ private void DrawShared( PaintEventArgs e )
+ {
+ // Label
+ e.Graphics.FillRectangle( _labelBrush, 2, 2, _labelWidth, this.ClientRectangle.Height - 4 );
+ e.Graphics.DrawLine( _vertGridPen,
+ 2 + _labelWidth, 2,
+ 2 + _labelWidth, this.ClientRectangle.Height - 3 );
+ }
+
+ protected override void OnPaint( PaintEventArgs e )
+ {
+ this.OnPaintBackground( e );
+
+ e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit;
+
+ int x = 2;
+ int y = 2;
+
+ Brush valueBrush = ( this.Enabled == true ) ? _valueFontBrush : _disabledFontBrush;
+
+ for( int n = _firstVisibleLine; n <= _lastVisibleLine; n++ )
+ {
+ LogLine line = _lines[ n ];
+
+ // Label
+ e.Graphics.DrawString( line.Feature.ToString(), _font, _labelFontBrushes[ ( int )line.Verbosity ], x, y, _stringFormat );
+
+ // Value
+ e.Graphics.DrawString( line.Value, _font, valueBrush, x + _labelWidth + 4, y, _stringFormat );
+
+ y += _lineHeight;
+ }
+ }
+
+ #endregion
+ }
+}

Modified: trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogTool.Designer.cs
==============================================================================
--- trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogTool.Designer.cs (original)
+++ trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogTool.Designer.cs Sun Mar 23 21:30:36 2008
@@ -28,13 +28,26 @@
/// </summary>
private void InitializeComponent()
{
+ this.logControl = new Noxa.Emulation.Psp.Player.Debugger.Tools.LogControl();
this.SuspendLayout();
//
+ // logControl
+ //
+ this.logControl.Anchor = ( ( System.Windows.Forms.AnchorStyles )( ( ( ( System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom )
+ | System.Windows.Forms.AnchorStyles.Left )
+ | System.Windows.Forms.AnchorStyles.Right ) ) );
+ this.logControl.Location = new System.Drawing.Point( 4, 4 );
+ this.logControl.Name = "logControl";
+ this.logControl.Size = new System.Drawing.Size( 821, 174 );
+ this.logControl.TabIndex = 0;
+ this.logControl.Text = "logControl";
+ //
// LogTool
//
this.AutoScaleDimensions = new System.Drawing.SizeF( 6F, 13F );
this.ClientSize = new System.Drawing.Size( 829, 182 );
this.CloseButton = false;
+ this.Controls.Add( this.logControl );
this.Name = "LogTool";
this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.DockBottom;
this.TabText = "Log";
@@ -43,5 +56,7 @@
}

#endregion
+
+ private LogControl logControl;
}
}

Modified: trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogTool.cs
==============================================================================
--- trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogTool.cs (original)
+++ trunk/Noxa.Emulation.Psp.Player/Debugger/Tools/LogTool.cs Sun Mar 23 21:30:36 2008
@@ -34,7 +34,12 @@

public void WriteLine( Verbosity verbosity, Feature feature, string value )
{
- Debug.WriteLine( string.Format( "{0}: {1}", feature, value ) );
+ // if log to vs
+ if( false )
+ {
+ Debug.WriteLine( string.Format( "{0}: {1}", feature, value ) );
+ }
+ this.logControl.AddLine( verbosity, feature, value );
}
}
}

Modified: trunk/Noxa.Emulation.Psp.Player/Noxa.Emulation.Psp.Player.csproj
==============================================================================
--- trunk/Noxa.Emulation.Psp.Player/Noxa.Emulation.Psp.Player.csproj (original)
+++ trunk/Noxa.Emulation.Psp.Player/Noxa.Emulation.Psp.Player.csproj Sun Mar 23 21:30:36 2008
@@ -152,6 +152,12 @@
<Compile Include="Debugger\Tools\DisassemblyControl.Designer.cs">
<DependentUpon>DisassemblyControl.cs</DependentUpon>
</Compile>
+ <Compile Include="Debugger\Tools\LogControl.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="Debugger\Tools\LogControl.Designer.cs">
+ <DependentUpon>LogControl.cs</DependentUpon>
+ </Compile>
<Compile Include="Debugger\Tools\LogTool.cs">
<SubType>Form</SubType>
</Compile>

Modified: trunk/Noxa.Emulation.Psp.Video.ManagedGL/MGLDriver.Worker.cs
==============================================================================
--- trunk/Noxa.Emulation.Psp.Video.ManagedGL/MGLDriver.Worker.cs (original)
+++ trunk/Noxa.Emulation.Psp.Video.ManagedGL/MGLDriver.Worker.cs Sun Mar 23 21:30:36 2008
@@ -222,7 +222,7 @@
case VideoCommand.FINISH:
if( didRealDrawing == true )
{
- Debug.WriteLine( "finished list" );
+ //Debug.WriteLine( "finished list" );
//this.NextFrame();
//Gl.glFlush();
}