Attachment #49913 for bug #116981

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

Lines 893-900 Link Here

(-)sysp/maps/Identity.map (-2 / +2 lines)
893	NAME=NVidia§DEVICE=GeForce4 448 Go (0x018D)§VID=0x10de§DID=0x018D§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D	893	NAME=NVidia§DEVICE=GeForce4 448 Go (0x018D)§VID=0x10de§DID=0x018D§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
894	NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT	894	NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
895	NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D	895	NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
896	NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT	896	NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=NVidia_DualHead_DriverOptions§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
897	NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D	897	NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=NVidia_DualHead_DriverOptions§SCRIPT3D=§PACKAGE3D=§FLAG=3D
898	NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT	898	NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
899	NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D	899	NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
900	NAME=NVidia§DEVICE=Quadro NVS 285§VID=0x10de§DID=0x0163§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT	900	NAME=NVidia§DEVICE=Quadro NVS 285§VID=0x10de§DID=0x0163§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT

Lines 893-900 Link Here

(-)sysp/maps/arch/Identity.map.x86_64 (-2 / +2 lines)
893	NAME=NVidia§DEVICE=GeForce4 448 Go (0x018D)§VID=0x10de§DID=0x018D§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D	893	NAME=NVidia§DEVICE=GeForce4 448 Go (0x018D)§VID=0x10de§DID=0x018D§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
894	NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT	894	NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
895	NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D	895	NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
896	NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT	896	NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=NVidia_DualHead_DriverOptions§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
897	NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D	897	NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=NVidia_DualHead_DriverOptions§SCRIPT3D=§PACKAGE3D=§FLAG=3D
898	NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT	898	NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
899	NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D	899	NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
900	NAME=NVidia§DEVICE=Quadro NVS 285§VID=0x10de§DID=0x0163§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT	900	NAME=NVidia§DEVICE=Quadro NVS 285§VID=0x10de§DID=0x0163§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT

Lines 893-900 Link Here

(-)sysp/maps/arch/Identity.map.i386 (-2 / +2 lines)
893	NAME=NVidia§DEVICE=GeForce4 448 Go (0x018D)§VID=0x10de§DID=0x018D§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D	893	NAME=NVidia§DEVICE=GeForce4 448 Go (0x018D)§VID=0x10de§DID=0x018D§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
894	NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT	894	NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
895	NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D	895	NAME=NVidia§DEVICE=Quadro FX 3450/4000 SDI§VID=0x10de§DID=0x00cd§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
896	NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT	896	NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=NVidia_DualHead_DriverOptions§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
897	NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D	897	NAME=NVidia§DEVICE=GeForce 6200 TurboCache(TM)§VID=0x10de§DID=0x0161§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=NVidia_DualHead_DriverOptions§SCRIPT3D=§PACKAGE3D=§FLAG=3D
898	NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT	898	NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nv§EXT=§OPT=§RAW=Option "XaaNoPixmapCache" "on",Option "XaaNoOffScreenPixmaps" "on"§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT
899	NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D	899	NAME=NVidia§DEVICE=GeForce 6200SE TurboCache(TM)§VID=0x10de§DID=0x0162§SERVER=nvidia§EXT=§OPT=§RAW=§PROFILE=nvidia§SCRIPT3D=§PACKAGE3D=§FLAG=3D
900	NAME=NVidia§DEVICE=Quadro NVS 285§VID=0x10de§DID=0x0163§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT	900	NAME=NVidia§DEVICE=Quadro NVS 285§VID=0x10de§DID=0x0163§SERVER=nv§EXT=§OPT=§RAW=§PROFILE=§SCRIPT3D=§PACKAGE3D=§FLAG=DEFAULT

Lines 35-40 Link Here

(-)sysp/script/machine.pl (-1 / +1 lines)
35	};	35	};
36	# any other ( default )...	36	# any other ( default )...
37	# -------------------------	37	# -------------------------
38	print "pc104\n";	38	print "pc105\n";
39	}	39	}
40		40

Lines 1-4 Link Here

(-)rpm/sax2.changes (+9 lines)
1	-------------------------------------------------------------------	1	-------------------------------------------------------------------
		2	Tue Sep 13 08:45:32 CEST 2005 - ms@suse.de
		3
		4	- added support for another IBook G4 display (#116594)
		5	- fixed PPC keyboard detection to use pc105 as default model (#116946)
		6	- switched off using xmset for enabled/disable mouse in init.pl (#116946)
		7	- fixed monitor display bug crashing sax if an unknown resolution
		8	key is used. This happens for example on 720x400 displays (#116946)
		9
		10	-------------------------------------------------------------------
2	Mon Sep 12 18:52:30 CEST 2005 - ms@suse.de	11	Mon Sep 12 18:52:30 CEST 2005 - ms@suse.de
3		12
4	- added support for another IBook G4 display (#116481)	13	- added support for another IBook G4 display (#116481)

Lines 1-7 Link Here

(-)api/data/cdb/Monitors (-1 / +13 lines)
1	# /.../	1	# /.../
2	# Copyright (c) 2001 SuSE GmbH Nuernberg, Germany. All rights reserved.	2	# Copyright (c) 2001 SuSE GmbH Nuernberg, Germany. All rights reserved.
3	#	3	#
4	# Author: Marcus Schaefer <sax@suse.de>, Mon Sep 12 18:52:13 2005	4	# Author: Marcus Schaefer <sax@suse.de>, Tue Sep 13 08:45:10 2005
5	#	5	#
6	# Template for monitor data	6	# Template for monitor data
7	# --------------------------	7	# --------------------------
Lines 3279-3284 Link Here
3279	}	3279	}
3280		3280
3281	#==============================================	3281	#==============================================
		3282	# COLOR LCD 9C2C
		3283	#----------------------------------------------
		3284	APPLE:COLOR LCD 9C2C {
		3285	DDC=APP9C2C
		3286	Option=DPMS
		3287	Hsync=58-72
		3288	Modeline="1440x900" 126.98 1440 1536 1688 1936 900 901 904 937
		3289	Resolution=1440x900
		3290	Vsync=30-90
		3291	}
		3292
		3293	#==============================================
3282	# DATACON 159047	3294	# DATACON 159047
3283	#----------------------------------------------	3295	#----------------------------------------------
3284	ARP:DATACON 159047 {	3296	ARP:DATACON 159047 {




	mColors -> setCurrentText (*mColorDict[colorKey]);
	// set primary resolution
	QString resolutionKey = *mSelectedResolution.at(0);
	if (! mResolutionDict[resolutionKey]) {
		log (L_WARN,
			"SCCMonitorDisplay::Warning: res key %s is missing\n",
			resolutionKey.ascii()
		);
		log (L_WARN,
			"SCCMonitorDisplay::Warning: reset to default 640x480 key\n"
		);
		resolutionKey="640x480";
	}
	mResolution -> setCurrentText (*mResolutionDict[resolutionKey]);
	slotResolution ( mResolution->currentItem() );
}

Lines 1384-1390 Link Here

(-)init.pl (-2 / +2 lines)
1384	# enable the mouse pointer again after	1384	# enable the mouse pointer again after
1385	# it was disabled using DisableMouse()	1385	# it was disabled using DisableMouse()
1386	#	1386	#
1387	system("$spec{Xmset} -d $dpy --enable 2>/dev/null >/dev/null");	1387	# system("$spec{Xmset} -d $dpy --enable 2>/dev/null >/dev/null");
1388	}	1388	}
1389		1389
1390	#---[ DisableMouse ]----#	1390	#---[ DisableMouse ]----#
Lines 1393-1399 Link Here
1393	# disable mouse to prevent us from haply	1393	# disable mouse to prevent us from haply
1394	# mouse events	1394	# mouse events
1395	#	1395	#
1396	system("$spec{Xmset} -d $dpy --disable 2>/dev/null >/dev/null");	1396	# system("$spec{Xmset} -d $dpy --disable 2>/dev/null >/dev/null");
1397	}	1397	}
1398		1398
1399	#----[ usage ]----#	1399	#----[ usage ]----#

Return to bug 116981

Lines 362-367 Link Here

(-)api/monitor/monitordisplay.cpp (+10 lines)
362	mColors -> setCurrentText (*mColorDict[colorKey]);	362	mColors -> setCurrentText (*mColorDict[colorKey]);
363	// set primary resolution	363	// set primary resolution
364	QString resolutionKey = *mSelectedResolution.at(0);	364	QString resolutionKey = *mSelectedResolution.at(0);
		365	if (! mResolutionDict[resolutionKey]) {
		366	log (L_WARN,
		367	"SCCMonitorDisplay::Warning: res key %s is missing\n",
		368	resolutionKey.ascii()
		369	);
		370	log (L_WARN,
		371	"SCCMonitorDisplay::Warning: reset to default 640x480 key\n"
		372	);
		373	resolutionKey="640x480";
		374	}
365	mResolution -> setCurrentText (*mResolutionDict[resolutionKey]);	375	mResolution -> setCurrentText (*mResolutionDict[resolutionKey]);
366	slotResolution ( mResolution->currentItem() );	376	slotResolution ( mResolution->currentItem() );
367	}	377	}