Attachment #263054 for bug #463288

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




	str scr  ; sprintf(scr,":%d",disp);
	str log  ; sprintf(log,"/var/log/%s.%d.log",LOADER_NAME,disp);
	str lgv  ; sprintf(lgv,"255");
	str bground; sprintf(bground,"-br");
	Display   *dpy  = NULL;
	int spid    = 0;
	int hasRR12 = False;
	int major, minor;
	string result = "";
	string proc = qx(
		XWRAPPER,STDOUT,8,"%s %s %s %s %s %s %s %s",
		XW_LOG,BLANK,VERBOSE,lgv,CONFIG,file,bground,scr
	);
	spid = atoi(proc.c_str());
	dpy = XOpenDisplay (scr);

	str scr  ; sprintf(scr,":%d",dpy);
	str log  ; sprintf(log,"/var/log/%s.%d.log",LOADER_NAME,dpy);
	str lgv  ; sprintf(lgv,"255");
	str bground; sprintf(bground,"-br");
	MsgDetect *parse = NULL;
	Display   *disp  = NULL;
	int spid  = 0;


	if (access(log,R_OK) != 0) {
		string proc = qx(
			XWRAPPER,STDOUT,8,"%s %s %s %s %s %s %s" %s,
			XW_LOG,BLANK,VERBOSE,lgv,CONFIG,file,bground,scr
		);
		disp = XOpenDisplay (scr);
		if (disp) {

Lines 17-23 Link Here

(-)sysp/script/memory.pl (-1 / +1 lines)
17	my $logs = "/var/log/Xorg.99.log";	17	my $logs = "/var/log/Xorg.99.log";
18	my $video;	18	my $video;
19	if (! -f $logs) {	19	if (! -f $logs) {
20	my $param = "-probeonly -logverbose 255 -verbose -xf86config $ARGV[0]";	20	my $param = "-probeonly -logverbose 255 -verbose -xf86config $ARGV[0] -br";
21	qx (X $param :99 2>&1);	21	qx (X $param :99 2>&1);
22	$code = $? >> 8;	22	$code = $? >> 8;
23	}	23	}

Lines 103-109 Link Here

(-)profile/script/Profile.pm (-1 / +1 lines)
103	my $xorglogname = "/var/log/Xorg.99.log";	103	my $xorglogname = "/var/log/Xorg.99.log";
104	if (($ENV{HW_UPDATE} == 1) \|\| (! -f $xorglogname)) {	104	if (($ENV{HW_UPDATE} == 1) \|\| (! -f $xorglogname)) {
105	my $xc = ProfileCreatePreliminaryConfig();	105	my $xc = ProfileCreatePreliminaryConfig();
106	qx (Xorg -probeonly -logverbose 255 -xf86config $xc :99 >/dev/null 2>&1);	106	qx (Xorg -probeonly -logverbose 255 -xf86config $xc -br :99 >/dev/null 2>&1);
107	}	107	}
108	local $/;	108	local $/;
109	open (FD, "<$xorglogname") \|\|	109	open (FD, "<$xorglogname") \|\|

Return to bug 463288

Lines 336-349 Link Here

(-)sysp/cfg.c (-4 / +6 lines)
336	str scr ; sprintf(scr,":%d",disp);	336	str scr ; sprintf(scr,":%d",disp);
337	str log ; sprintf(log,"/var/log/%s.%d.log",LOADER_NAME,disp);	337	str log ; sprintf(log,"/var/log/%s.%d.log",LOADER_NAME,disp);
338	str lgv ; sprintf(lgv,"255");	338	str lgv ; sprintf(lgv,"255");
		339	str bground; sprintf(bground,"-br");
339	Display *dpy = NULL;	340	Display *dpy = NULL;
340	int spid = 0;	341	int spid = 0;
341	int hasRR12 = False;	342	int hasRR12 = False;
342	int major, minor;	343	int major, minor;
343	string result = "";	344	string result = "";
344	string proc = qx(	345	string proc = qx(
345	XWRAPPER,STDOUT,7,"%s %s %s %s %s %s %s",	346	XWRAPPER,STDOUT,8,"%s %s %s %s %s %s %s %s",
346	XW_LOG,BLANK,VERBOSE,lgv,CONFIG,file,scr	347	XW_LOG,BLANK,VERBOSE,lgv,CONFIG,file,bground,scr
347	);	348	);
348	spid = atoi(proc.c_str());	349	spid = atoi(proc.c_str());
349	dpy = XOpenDisplay (scr);	350	dpy = XOpenDisplay (scr);
Lines 454-459 Link Here
454	str scr ; sprintf(scr,":%d",dpy);	455	str scr ; sprintf(scr,":%d",dpy);
455	str log ; sprintf(log,"/var/log/%s.%d.log",LOADER_NAME,dpy);	456	str log ; sprintf(log,"/var/log/%s.%d.log",LOADER_NAME,dpy);
456	str lgv ; sprintf(lgv,"255");	457	str lgv ; sprintf(lgv,"255");
		458	str bground; sprintf(bground,"-br");
457	MsgDetect *parse = NULL;	459	MsgDetect *parse = NULL;
458	Display *disp = NULL;	460	Display *disp = NULL;
459	int spid = 0;	461	int spid = 0;
Lines 461-468 Link Here
461		463
462	if (access(log,R_OK) != 0) {	464	if (access(log,R_OK) != 0) {
463	string proc = qx(	465	string proc = qx(
464	XWRAPPER,STDOUT,7,"%s %s %s %s %s %s %s",	466	XWRAPPER,STDOUT,8,"%s %s %s %s %s %s %s" %s,
465	XW_LOG,BLANK,VERBOSE,lgv,CONFIG,file,scr	467	XW_LOG,BLANK,VERBOSE,lgv,CONFIG,file,bground,scr
466	);	468	);
467	disp = XOpenDisplay (scr);	469	disp = XOpenDisplay (scr);
468	if (disp) {	470	if (disp) {