Attachment 107832 Details for Bug 224924

[patch] yast2-x11.dif

yast2-x11.dif (text/plain), 4.75 KB, created by Marcus Schaefer on 2006-12-01 09:53:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Schaefer

Created: 2006-12-01 09:53:46 UTC

Size: 4.75 KB

patch

obsolete

>Index: src/proposal/x11_proposal.ycp
>===================================================================
>--- src/proposal/x11_proposal.ycp	(revision 34679)
>+++ src/proposal/x11_proposal.ycp	(working copy)
>@@ -108,6 +108,7 @@
> 	string	cardName    = (string)  XLib::getCardName();
> 	string	monitorName = (string)  XLib::getMonitorName();
> 	boolean	has3D       = (boolean) XLib::hasOpenGLFeatures();
>+	boolean isFbdevBased= (boolean) XLib::isFbdevBased();
> 	boolean	is3DCard    = (boolean) XLib::has3DCapabilities();
> 	boolean isNoteBook  = (boolean) XLib::isExternalVGANoteBook();
> 	boolean isNoteBookHW= (boolean) XLib::isNoteBookHardware();
>@@ -153,34 +154,64 @@
> 	//======================================
> 	// Monitor name and resolution...
> 	//--------------------------------------
>-	if (monitorInch == "undef") {
>+	if (! isFbdevBased) {
>+		if (monitorInch == "undef") {
>+			proposal = proposal
>+			+ LI
>+				+ XMessages::monitor + "<a href=\"sax-monitor\">"
>+				+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
>+				+ XMessages::Aspect + " " + XMessages::unconfigured + "</a>)"
>+				+ " - (<a href=\"sax-resolution\">" + resolution  + "</a>)"
>+			+ IL;
>+		} else {
>+			proposal = proposal
>+			+ LI
>+				+ XMessages::monitor + "<a href=\"sax-monitor\">"
>+				+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
>+				+ monitorSize[0]:"" + " " + XMessages::Inches + ", "
>+				+ XMessages::Aspect + " " + monitorSize[1]:"" + ":"
>+				+ monitorSize[2]:"" + "</a>)"
>+				+ " - (<a href=\"sax-resolution\">" + resolution  + "</a>)"
>+			+ IL;
>+		}
>+	} else {
>+		if (monitorInch == "undef") {
>+			proposal = proposal
>+			+ LI
>+				+ XMessages::monitor + "<a href=\"sax-monitor\">"
>+				+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
>+				+ XMessages::Aspect + " " + XMessages::unconfigured + "</a>)"
>+				+ " - (" + resolution  + ")"
>+			+ IL;
>+		} else {
>+			proposal = proposal
>+			+ LI
>+				+ XMessages::monitor + "<a href=\"sax-monitor\">"
>+				+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
>+				+ monitorSize[0]:"" + " " + XMessages::Inches + ", "
>+				+ XMessages::Aspect + " " + monitorSize[1]:"" + ":"
>+				+ monitorSize[2]:"" + "</a>)"
>+				+ " - (" + resolution  + ")"
>+			+ IL;
>+		}
>+	}
>+	//======================================
>+	// Colordepth and number of colors...
>+	//--------------------------------------
>+	if (! isFbdevBased) {
> 		proposal = proposal
> 		+ LI
>-			+ XMessages::monitor + "<a href=\"sax-monitor\">"
>-			+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
>-			+ XMessages::Aspect + " " + XMessages::unconfigured + "</a>)"
>-			+ " - (<a href=\"sax-resolution\">" + resolution  + "</a>)"
>+			+ XMessages::colorDepth + "<a href=\"sax-colors\">"
>+			+ colorDepth + "</a> Bit (" + colorCount + ")"
> 		+ IL;
> 	} else {
> 		proposal = proposal
> 		+ LI
>-			+ XMessages::monitor + "<a href=\"sax-monitor\">"
>-			+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
>-			+ monitorSize[0]:"" + " " + XMessages::Inches + ", "
>-			+ XMessages::Aspect + " " + monitorSize[1]:"" + ":"
>-			+ monitorSize[2]:"" + "</a>)" + " - (<a href=\"sax-resolution\">"
>-			+ resolution  + "</a>)"
>+			+ XMessages::colorDepth
>+			+ colorDepth + " Bit (" + colorCount + ")"
> 		+ IL;
> 	}
> 	//======================================
>-	// Colordepth and number of colors...
>-	//--------------------------------------
>-	proposal = proposal
>-	+ LI
>-		+ XMessages::colorDepth + "<a href=\"sax-colors\">"
>-		+ colorDepth + "</a> Bit (" + colorCount + ")"
>-	+ IL;
>-	//======================================
> 	// 3D acceleration status/availability
> 	//--------------------------------------
> 	if (is3DCard) {
>Index: src/XLib.pm
>===================================================================
>--- src/XLib.pm	(revision 34679)
>+++ src/XLib.pm	(working copy)
>@@ -378,6 +378,20 @@
> 	return 1;
> }
> #==========================================
>+# isFbdevBased
>+#------------------------------------------
>+BEGIN{ $TYPEINFO{isFbdevBased} = ["function", "boolean"]; }
>+sub isFbdevBased {
>+	my $class = shift;
>+	my $mCard = new SaX::SaXManipulateCard (
>+		$section{Card}
>+	);
>+	if ($mCard -> getCardDriver() eq "fbdev") {
>+		return 1;
>+	}
>+	return 0;
>+}
>+#==========================================
> # getCardName
> #------------------------------------------
> BEGIN{ $TYPEINFO{getCardName} = ["function", "string"]; }
>Index: package/yast2-x11.changes
>===================================================================
>--- package/yast2-x11.changes	(revision 34679)
>+++ package/yast2-x11.changes	(working copy)
>@@ -1,4 +1,9 @@
> -------------------------------------------------------------------
>+Fri Dec  1 10:46:23 CET 2006 - ms@suse.de
>+
>+- added fbdev handling according to driver restrictions (#224924)
>+
>+-------------------------------------------------------------------
> Thu Nov 30 14:09:41 CET 2006 - ms@suse.de
> 
> - 2.15.1

Actions: View | Diff

Attachments on bug 224924: 107705 | 107706 | 107707 | 107709 | 107710 | 107725 | 107726 | 107727 | 107832