Attachment #107832 for bug #224924

View | Details | Raw Unified | Return to bug 224924
Collapse All | Expand All




	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();

	//======================================
	// Monitor name and resolution...
	//--------------------------------------
	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::colorDepth + "<a href=\"sax-colors\">"
			+ colorDepth + "</a> Bit (" + colorCount + ")"
			+ XMessages::Aspect + " " + XMessages::unconfigured + "</a>)"
			+ " - (<a href=\"sax-resolution\">" + resolution  + "</a>)"
		+ IL;
	} else {
		proposal = proposal
		+ LI
			+ XMessages::colorDepth
			+ colorDepth + " Bit (" + colorCount + ")"
			+ monitorSize[0]:"" + " " + XMessages::Inches + ", "
			+ XMessages::Aspect + " " + monitorSize[1]:"" + ":"
			+ monitorSize[2]:"" + "</a>)" + " - (<a href=\"sax-resolution\">"
			+ resolution  + "</a>)"
		+ 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) {

Lines 378-383 Link Here

(-)src/XLib.pm (+14 lines)
378	return 1;	378	return 1;
379	}	379	}
380	#==========================================	380	#==========================================
		381	# isFbdevBased
		382	#------------------------------------------
		383	BEGIN{ $TYPEINFO{isFbdevBased} = ["function", "boolean"]; }
		384	sub isFbdevBased {
		385	my $class = shift;
		386	my $mCard = new SaX::SaXManipulateCard (
		387	$section{Card}
		388	);
		389	if ($mCard -> getCardDriver() eq "fbdev") {
		390	return 1;
		391	}
		392	return 0;
		393	}
		394	#==========================================
381	# getCardName	395	# getCardName
382	#------------------------------------------	396	#------------------------------------------
383	BEGIN{ $TYPEINFO{getCardName} = ["function", "string"]; }	397	BEGIN{ $TYPEINFO{getCardName} = ["function", "string"]; }

Lines 1-4 Link Here

(-)package/yast2-x11.changes (+5 lines)
1	-------------------------------------------------------------------	1	-------------------------------------------------------------------
		2	Fri Dec 1 10:46:23 CET 2006 - ms@suse.de
		3
		4	- added fbdev handling according to driver restrictions (#224924)
		5
		6	-------------------------------------------------------------------
2	Thu Nov 30 14:09:41 CET 2006 - ms@suse.de	7	Thu Nov 30 14:09:41 CET 2006 - ms@suse.de
3		8
4	- 2.15.1	9	- 2.15.1

Return to bug 224924

Lines 108-113 Link Here

(-)src/proposal/x11_proposal.ycp (-19 / +50 lines)
108	string cardName = (string) XLib::getCardName();	108	string cardName = (string) XLib::getCardName();
109	string monitorName = (string) XLib::getMonitorName();	109	string monitorName = (string) XLib::getMonitorName();
110	boolean has3D = (boolean) XLib::hasOpenGLFeatures();	110	boolean has3D = (boolean) XLib::hasOpenGLFeatures();
		111	boolean isFbdevBased= (boolean) XLib::isFbdevBased();
111	boolean is3DCard = (boolean) XLib::has3DCapabilities();	112	boolean is3DCard = (boolean) XLib::has3DCapabilities();
112	boolean isNoteBook = (boolean) XLib::isExternalVGANoteBook();	113	boolean isNoteBook = (boolean) XLib::isExternalVGANoteBook();
113	boolean isNoteBookHW= (boolean) XLib::isNoteBookHardware();	114	boolean isNoteBookHW= (boolean) XLib::isNoteBookHardware();
Lines 153-186 Link Here
153	//======================================	154	//======================================
154	// Monitor name and resolution...	155	// Monitor name and resolution...
155	//--------------------------------------	156	//--------------------------------------
156	if (monitorInch == "undef") {	157	if (! isFbdevBased) {
		158	if (monitorInch == "undef") {
		159	proposal = proposal
		160	+ LI
		161	+ XMessages::monitor + "<a href=\"sax-monitor\">"
		162	+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
		163	+ XMessages::Aspect + " " + XMessages::unconfigured + "</a>)"
		164	+ " - (<a href=\"sax-resolution\">" + resolution + "</a>)"
		165	+ IL;
		166	} else {
		167	proposal = proposal
		168	+ LI
		169	+ XMessages::monitor + "<a href=\"sax-monitor\">"
		170	+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
		171	+ monitorSize[0]:"" + " " + XMessages::Inches + ", "
		172	+ XMessages::Aspect + " " + monitorSize[1]:"" + ":"
		173	+ monitorSize[2]:"" + "</a>)"
		174	+ " - (<a href=\"sax-resolution\">" + resolution + "</a>)"
		175	+ IL;
		176	}
		177	} else {
		178	if (monitorInch == "undef") {
		179	proposal = proposal
		180	+ LI
		181	+ XMessages::monitor + "<a href=\"sax-monitor\">"
		182	+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
		183	+ XMessages::Aspect + " " + XMessages::unconfigured + "</a>)"
		184	+ " - (" + resolution + ")"
		185	+ IL;
		186	} else {
		187	proposal = proposal
		188	+ LI
		189	+ XMessages::monitor + "<a href=\"sax-monitor\">"
		190	+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"
		191	+ monitorSize[0]:"" + " " + XMessages::Inches + ", "
		192	+ XMessages::Aspect + " " + monitorSize[1]:"" + ":"
		193	+ monitorSize[2]:"" + "</a>)"
		194	+ " - (" + resolution + ")"
		195	+ IL;
		196	}
		197	}
		198	//======================================
		199	// Colordepth and number of colors...
		200	//--------------------------------------
		201	if (! isFbdevBased) {
157	proposal = proposal	202	proposal = proposal
158	+ LI	203	+ LI
159	+ XMessages::monitor + "<a href=\"sax-monitor\">"	204	+ XMessages::colorDepth + "<a href=\"sax-colors\">"
160	+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"	205	+ colorDepth + "</a> Bit (" + colorCount + ")"
161	+ XMessages::Aspect + " " + XMessages::unconfigured + "</a>)"
162	+ " - (<a href=\"sax-resolution\">" + resolution + "</a>)"
163	+ IL;	206	+ IL;
164	} else {	207	} else {
165	proposal = proposal	208	proposal = proposal
166	+ LI	209	+ LI
167	+ XMessages::monitor + "<a href=\"sax-monitor\">"	210	+ XMessages::colorDepth
168	+ monitorName + "</a> " + "(<a href=\"sax-displaysize\">"	211	+ colorDepth + " Bit (" + colorCount + ")"
169	+ monitorSize[0]:"" + " " + XMessages::Inches + ", "
170	+ XMessages::Aspect + " " + monitorSize[1]:"" + ":"
171	+ monitorSize[2]:"" + "</a>)" + " - (<a href=\"sax-resolution\">"
172	+ resolution + "</a>)"
173	+ IL;	212	+ IL;
174	}	213	}
175	//======================================	214	//======================================
176	// Colordepth and number of colors...
177	//--------------------------------------
178	proposal = proposal
179	+ LI
180	+ XMessages::colorDepth + "<a href=\"sax-colors\">"
181	+ colorDepth + "</a> Bit (" + colorCount + ")"
182	+ IL;
183	//======================================
184	// 3D acceleration status/availability	215	// 3D acceleration status/availability
185	//--------------------------------------	216	//--------------------------------------
186	if (is3DCard) {	217	if (is3DCard) {