X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Drawing%2FSystem.Drawing%2FgdipFunctions.cs;h=cf48ecd6ec821f2215a8582868eec23b668c0c8f;hb=455b2f894a2cc899fa469ac6fbe66dca163761b1;hp=9dcf37d2a56431a91e94187074a3c9a8fe8d3ae3;hpb=fce7752a3d64ce5084fd07b97db8a546c4f16100;p=mono.git

diff --git a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs
index 9dcf37d2a56..cf48ecd6ec8 100644
--- a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs
+++ b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs
@@ -59,9 +59,9 @@ namespace System.Drawing
 		public const int FACESIZE = 32;
 		public const int LANG_NEUTRAL = 0;
 		public static IntPtr Display = IntPtr.Zero;
-		public static bool UseX11Drawable;
-		public static bool UseQuartzDrawable = (Environment.GetEnvironmentVariable ("MONO_MWF_USE_CARBON_BACKEND") != null);
-		public static bool UseCocoaDrawable = (Environment.GetEnvironmentVariable ("MONO_GDIP_USE_COCOA_BACKEND") != null);
+		public static bool UseX11Drawable = false;
+		public static bool UseCarbonDrawable = false;
+		public static bool UseCocoaDrawable = false;
 
 		#region gdiplus.dll functions
 
@@ -99,10 +99,27 @@ namespace System.Drawing
 
 		static GDIPlus ()
 		{
-			// check for Unix platforms - see FAQ for more details
-			// http://www.mono-project.com/FAQ:_Technical#How_to_detect_the_execution_platform_.3F
 			int platform = (int) Environment.OSVersion.Platform;
-			UseX11Drawable = ((platform == 4) || (platform == 128));
+			if ((platform == 4) || (platform == 6) || (platform == 128)) {
+				if (Environment.GetEnvironmentVariable ("not_supported_MONO_MWF_USE_NEW_X11_BACKEND") != null || Environment.GetEnvironmentVariable ("MONO_MWF_MAC_FORCE_X11") != null) {
+					UseX11Drawable = true;
+				} else {
+					IntPtr buf = Marshal.AllocHGlobal (8192);
+					// This is kind of a hack but gets us sysname from uname (struct utsname *name) on
+					// linux and darwin
+					if (uname (buf) != 0) {
+						// WTH: We couldn't detect the OS; lets default to X11
+						UseX11Drawable = true;
+					} else {
+						string os = Marshal.PtrToStringAnsi (buf);
+						if (os == "Darwin")
+							UseCarbonDrawable = true;
+						else
+							UseX11Drawable = true;
+					}
+					Marshal.FreeHGlobal (buf);
+				}
+			}
 
 			GdiplusStartupInput input = GdiplusStartupInput.MakeGdiplusStartupInput();
 			GdiplusStartupOutput output = GdiplusStartupOutput.MakeGdiplusStartupOutput();
@@ -122,12 +139,12 @@ namespace System.Drawing
 
 		static public bool RunningOnWindows ()
 		{
-			return !UseX11Drawable;
+			return !UseX11Drawable && !UseCarbonDrawable && !UseCocoaDrawable;
 		}
 
 		static public bool RunningOnUnix ()
 		{
-			return UseX11Drawable;
+			return UseX11Drawable || UseCarbonDrawable || UseCocoaDrawable;
 		}
 		
 		// Copies a Ptr to an array of Points and releases the memory
@@ -1413,8 +1430,8 @@ namespace System.Drawing
 		internal static extern Status GdipCloneImageAttributes(IntPtr imageattr, out IntPtr cloneImageattr);
 
 		[DllImport ("gdiplus.dll")]     
-		internal static extern Status GdipGetImageAttributesAdjustedPalette(IntPtr imageattr,
-    			out IntPtr colorPalette,  ColorAdjustType colorAdjustType);
+		internal static extern Status GdipGetImageAttributesAdjustedPalette (IntPtr imageattr, IntPtr colorPalette,
+			ColorAdjustType colorAdjustType);
     			
     		[DllImport ("gdiplus.dll")]     
 		internal static extern Status GdipSetImageAttributesWrapMode(IntPtr imageattr,  WrapMode wrap,
@@ -1477,6 +1494,9 @@ namespace System.Drawing
 		[DllImport ("libX11", EntryPoint="XRootWindow")]
 		internal extern static IntPtr XRootWindow(IntPtr display, int screen);
 			
+		[DllImport ("libX11", EntryPoint="XDefaultScreen")]
+		internal extern static int XDefaultScreen(IntPtr display);
+
 		[DllImport ("libX11", EntryPoint="XDefaultDepth")]
 		internal extern static uint XDefaultDepth(IntPtr display, int screen);
 
@@ -1496,7 +1516,7 @@ namespace System.Drawing
 		internal extern static IntPtr XGetVisualInfo (IntPtr display, int vinfo_mask, ref XVisualInfo vinfo_template, ref int nitems);
 
 		[DllImport ("libX11", EntryPoint="XVisualIDFromVisual")]
-		internal extern static int XVisualIDFromVisual(IntPtr visual);
+		internal extern static IntPtr XVisualIDFromVisual (IntPtr visual);
 
 		[DllImport ("libX11", EntryPoint="XFree")]
 		internal extern static void XFree (IntPtr data);	
@@ -1684,8 +1704,7 @@ namespace System.Drawing
 		public delegate void StreamCloseDelegate ();
 		public delegate long StreamSizeDelegate ();
 
-		internal class GdiPlusStreamHelper 
-		{
+		internal sealed class GdiPlusStreamHelper {
 			public Stream stream;
 			
 			private StreamGetHeaderDelegate sghd = null;
@@ -1919,7 +1938,7 @@ namespace System.Drawing
 		
 		/* Mac only function calls */
 		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipCreateFromQuartz_macosx (IntPtr cgref, int width, int height, out IntPtr graphics);
+		internal static extern Status GdipCreateFromContext_macosx (IntPtr cgref, int width, int height, out IntPtr graphics);
 
 		/* Linux only function calls*/
 		[DllImport("gdiplus.dll")]
@@ -1960,6 +1979,9 @@ namespace System.Drawing
 			StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, 
 			StreamCloseDelegate close, StreamSizeDelegate size, IntPtr hdc, EmfType type, ref Rectangle frameRect, 
 			MetafileFrameUnit frameUnit, [MarshalAs (UnmanagedType.LPWStr)] string description, out IntPtr metafile);
+
+		[DllImport ("libc")]
+		static extern int uname (IntPtr buf);
 #endregion
 	}
 }