debugTestDRM

8 files changed, 21 insertions, 14 deletions

diff --git a/testDrm/Main.cs b/testDrm/Main.cs
index 45a95d63..81216d34 100644
--- a/testDrm/Main.cs
+++ b/testDrm/Main.cs
@@ -55,8 +55,9 @@ namespace testDrm
 			System.Threading.Thread.CurrentThread.Name = "Main";
 
 			try {
-				using (TestApp crowApp = new TestApp ())					
+				using (TestApp crowApp = new TestApp ()){
 					crowApp.Run ();
+				}
 			} catch (Exception ex) {
 				Console.WriteLine (ex.ToString ());
 			}
@@ -73,7 +74,7 @@ namespace testDrm
 		#endregion
 
 
-		public Command CMDViewPerf, CMDViewCfg, CMDViewTest0, CMDOpen;
+		public Command CMDViewPerf, CMDViewCfg, CMDViewTest0, CMDViewGO, CMDOpen;
 
 		public TestApp () : base () {
 			CrowInterface.KeyboardKeyDown += CrowInterface_KeyboardKeyDown;
@@ -81,12 +82,13 @@ namespace testDrm
 			CMDViewPerf = new Command(new Action(() => Load ("#testDrm.ui.perfMeasures.crow").DataSource = this)) { Caption = "Performances"};
 			CMDViewCfg = new Command(new Action(() => Load ("#testDrm.ui.2.crow").DataSource = this)) { Caption = "Configuration"};
 			CMDViewTest0 = new Command(new Action(() => Load ("#testDrm.ui.0.crow").DataSource = this)) { Caption = "Test view 0"};
+			CMDViewGO = new Command(new Action(() => Load ("#testDrm.ui.go.crow").DataSource = this)) { Caption = "graphic test"};
 			CMDOpen = new Command(new Action(() => { 
 				lock (CrowInterface.UpdateMutex) CrowInterface.AddWidget(new FileDialog());})) { Caption = "Open"};
 
 			Load ("#testDrm.ui.menu.crow").DataSource = this;
 
-			initTests ();
+			//initTests ();
 		}
 
 		void CrowInterface_KeyboardKeyDown (object sender, KeyboardKeyEventArgs e)
diff --git a/testDrm/src/Application.cs b/testDrm/src/Application.cs
index 7efc0906..30a9573f 100644
--- a/testDrm/src/Application.cs
+++ b/testDrm/src/Application.cs
@@ -101,7 +101,7 @@ namespace Crow
 					Console.WriteLine (ex.ToString ());	
 				}
 			}
-
+				
 			gpu = new DRIControler();
 
 			initCrow ();
@@ -591,11 +591,11 @@ namespace Crow
 			gpu = null;
 
 			using (VTControler master = new VTControler ()) {
-				//				try {
-				//					master.KDMode = VT.KDMode.TEXT;
-				//				} catch (Exception ex) {
-				//					Console.WriteLine (ex.ToString ());	
-				//				}
+				try {
+					master.KDMode = KDMode.TEXT;
+				} catch (Exception ex) {
+					Console.WriteLine (ex.ToString ());	
+				}
 				master.SwitchTo (previousVT);
 			}
 
diff --git a/testDrm/src/Linux/DRIControler.cs b/testDrm/src/Linux/DRIControler.cs
index cb2794f2..3d5f3009 100644
--- a/testDrm/src/Linux/DRIControler.cs
+++ b/testDrm/src/Linux/DRIControler.cs
@@ -231,7 +231,7 @@ namespace Linux.DRI {
 			//setScanOutRegion();
 			//Thread.Sleep (100);
 
-			initPageFlipUpdate ();
+			//initPageFlipUpdate ();
 			return true;
 		}
 
diff --git a/testDrm/test.style b/testDrm/test.style
index 0db7f47d..7e06174b 100644
--- a/testDrm/test.style
+++ b/testDrm/test.style
@@ -14,4 +14,5 @@ FpsDisp {
 }
 Window {
 	Template = #Crow.ToolWindow.template;
+	Background = DimGray;
 }
diff --git a/testDrm/testDrm.csproj b/testDrm/testDrm.csproj
index 27db51e6..2cf19157 100644
--- a/testDrm/testDrm.csproj
+++ b/testDrm/testDrm.csproj
@@ -19,13 +19,13 @@
         <Command type="Execute" command="${TargetName}" workingdir="${SolutionDir}/build/${ProjectConfigName}" />
       </CustomCommands>
     </CustomCommands>
-    <StartupObject>testDrm.TestCrow</StartupObject>
+    <StartupObject>testDrm.TestApp</StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;</DefineConstants>
+    <DefineConstants>DEBUG;MEASURE_TIME</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/testDrm/ui/go.crow b/testDrm/ui/go.crow
index c3eda9cc..572e2cca 100755
--- a/testDrm/ui/go.crow
+++ b/testDrm/ui/go.crow
@@ -1,2 +1,4 @@
 <?xml version="1.0"?>
-<GraphicObject Width="200" Height="200" Background="Mantis"/>
\ No newline at end of file
+<Window Width="300" Height="300" Background="Transparent">
+	<TestWidget Width="200" Height="200" Background="Mantis"/>
+</Window>
\ No newline at end of file
diff --git a/testDrm/ui/menu.crow b/testDrm/ui/menu.crow
index abe22fbc..df760fae 100755
--- a/testDrm/ui/menu.crow
+++ b/testDrm/ui/menu.crow
@@ -10,6 +10,7 @@
 		<MenuItem Command="{CMDViewPerf}"/>
 		<MenuItem Command="{CMDViewCfg}"/>
 		<MenuItem Command="{CMDViewTest0}"/>
+		<MenuItem Command="{CMDViewGO}"/>
 	</MenuItem>
 	<MenuItem Caption="Edit" Name="edit" Width="Fit">
 		<MenuItem Caption="Cut"/>
diff --git a/testDrm/ui/perfMeasures.crow b/testDrm/ui/perfMeasures.crow
index efeac653..5584a6b7 100755
--- a/testDrm/ui/perfMeasures.crow
+++ b/testDrm/ui/perfMeasures.crow
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
-<Window AlwaysOnTop="true" Focusable="true" Caption="Measures" Width="200" Height="360" MinimumSize="100,100" Background="0.2,0.2,0.2,0.2" CornerRadius="10">
+<Window AlwaysOnTop="true" Focusable="true" Caption="Measures" Width="200" Height="360" MinimumSize="100,100"
+	Background="0.2,0.2,0.2,0.7" CornerRadius="10">
 	<ListBox Data="{PerfMeasures}" Fit="true" ItemTemplate="#ui.perfMsr.crow" Background="Transparent"/>
 </Window>