--- ./install.sh	Fri Nov 22 21:56:38 2002
+++ ../xmcd-3.2.0/./install.sh	Thu Jan  2 01:26:34 2003
@@ -39,7 +39,7 @@
 #
 
 OPATH="$PATH"
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/local/bin
+PATH=/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/freeware/bin
 export PATH
 
 XMCD_VER=3.2.0
@@ -319,7 +319,7 @@
 	# Set LD_LIBRARY_PATH to point to all conceivable places where
 	# dynamic libraries can hide
 	#
-	LD_LIBRARY_PATH=$LIBDIR:/usr/X/lib:/usr/X11/lib:/usr/X386/lib:/usr/X11R5/lib:/usr/X11R6/lib:/usr/openwin/lib:/usr/X/desktop:/usr/Motif/lib:/usr/Motif1.1/lib:/usr/Motif1.2/lib:/usr/Motif2.0/lib:/usr/dt/lib:/usr/lib/X11:/usr/ccs/lib:/usr/lib:/lib
+	LD_LIBRARY_PATH=$LIBDIR:/usr/freeware/lib32:/usr/X/lib:/usr/X11/lib:/usr/X386/lib:/usr/X11R5/lib:/usr/X11R6/lib:/usr/openwin/lib:/usr/X/desktop:/usr/Motif/lib:/usr/Motif1.1/lib:/usr/Motif1.2/lib:/usr/Motif2.0/lib:/usr/dt/lib:/usr/lib/X11:/usr/ccs/lib:/usr/lib:/lib
 	export LD_LIBRARY_PATH
 
 	# Find the ldd program
@@ -492,7 +492,9 @@
 #
 OS_SYS=`(uname -s) 2>/dev/null`
 OS_REL=`(uname -r) 2>/dev/null`
-OS_MACH=`(uname -m) 2>/dev/null`
+# On IRIX, do not differentiate on the machine hardware
+# OS_MACH=`(uname -m) 2>/dev/null`
+OS_MACH=ALL
 
 if [ -z "$OS_SYS" ]
 then
@@ -699,7 +701,8 @@
 	$ECHO "\n\nYou should be the super user to install xmcd."
 
 	YNDEF=n
-	if [ -z "$BATCH" ] && get_yn "\n  Proceed with installation anyway"
+	if [ -n "$NONROOTINST" ] || \
+	   ( [ -z "$BATCH" ] && get_yn "\n  Proceed with installation anyway" )
 	then
 		$ECHO "\nWARNING: Without super-user privilege, some files may"
 		$ECHO "not be properly installed, or they may be installed"
@@ -754,6 +757,7 @@
 # Determine BINDIR
 
 BINTRYDIRS="\
+	/usr/freeware/bin \
 	/usr/bin/X11 \
 	/usr/X/bin \
 	/usr/X11/bin \
@@ -767,6 +771,7 @@
 	/usr/freeware/bin \
 "
 
+echo BINDIR=$BINDIR
 if [ -z "$BINDIR" ]
 then
 	for i in $BINTRYDIRS
@@ -834,6 +839,7 @@
 # Determine LIBDIR
 
 LIBTRYDIRS="\
+	/usr/freeware/lib/X11 \
 	/usr/lib/X11 \
 	/usr/X/lib \
 	/usr/X11/lib \
@@ -944,7 +950,8 @@
 
 if [ -z "$MANDIR" ]
 then
-	for i in	/usr/man/man.LOCAL \
+	for i in	/usr/freeware/catman/u_man/cat1 \
+			/usr/man/man.LOCAL \
 			/usr/share/man/man1 \
 			/usr/X11/man/man1 \
 			/usr/X/man/man1 \
--- ./libdi_d/common.cfg	Fri Nov 22 21:56:44 2002
+++ ../xmcd-3.2.0/./libdi_d/common.cfg	Wed Jan  1 12:10:30 2003
@@ -78,7 +78,7 @@
 ! /dev/rdsk/m187_c0d3s7		(UNIX SVR4.0/88k, m187 controller 0, SCSI ID 3)
 ! DKA500:			(Digital OpenVMS)
 ! 
-device:			/dev/rcd0
+device:			/dev/scsi/sc0d4l0
 
 ! For CDDA playback mode, this selects the audio output port(s).  The
 ! value is the sum of the following:
--- ./libdi_d/device.cfg	Fri Nov 22 21:56:44 2002
+++ ../xmcd-3.2.0/./libdi_d/device.cfg	Wed Jan  1 12:10:30 2003
@@ -58,7 +58,7 @@
 !	/dev/cdrom0
 !	/dev/rcdrom/c0b0t0d0;/dev/rcdrom/c0b0t0d1;/dev/rcdrom/c0b0t0d2
 !
-deviceList:		/dev/rcd0
+deviceList:		/dev/scsi/sc0d4l0
 
 ! Default start-up playback mode.
 !
@@ -136,7 +136,7 @@
 ! 0	None				(Don't do direct CDDA)
 ! 1	OSS sound driver method		(For Linux & OSS sound drivers)
 ! 2	Solaris audio driver method	(For Sun Solaris audio driver)
-! 3	Irix audio driver method	(For SGI Irix audio driver)
+! 3	IRIX audio driver method	(For SGI IRIX audio driver)
 ! 4	HP-UX audio driver method	(For HP-UX audio driver)
 ! 5	AIX audio driver method		(For IBM AIX Ultimedia audio driver)
 ! 6	ALSA audio driver method	(For Linux with ALSA sound driver)
--- ./libdi_d/os_irix.h	Fri Nov 22 21:56:45 2002
+++ ../xmcd-3.2.0/./libdi_d/os_irix.h	Wed Jan  1 12:10:30 2003
@@ -20,11 +20,11 @@
  */
 
 /*
- *   Silicon Graphics Irix support
+ *   Silicon Graphics IRIX support
  *
  *   This software fragment contains code that interfaces the
- *   application to the SGI Irix operating system.  The names "SGI" and
- *   "Irix" are used here for identification purposes only.
+ *   application to the SGI IRIX operating system.  The names "SGI" and
+ *   "IRIX" are used here for identification purposes only.
  */
 #ifndef __OS_IRIX_H__
 #define __OS_IRIX_H__
@@ -38,6 +38,7 @@
 #endif
 
 #include <sys/dsreq.h>
+#include <mediad.h>
 
 
 #define OS_MODULE	/* Indicate that this is compiled on a supported OS */
--- ./libdi_d/os_irix.c	Fri Nov 22 21:56:45 2002
+++ ../xmcd-3.2.0/./libdi_d/os_irix.c	Wed Jan  1 12:10:30 2003
@@ -20,11 +20,14 @@
  */
 
 /*
- *   Silicon Graphics Irix support
+ *   Silicon Graphics IRIX support
  *
  *   This software fragment contains code that interfaces the
- *   application to the SGI Irix operating system.  The names "SGI" and
- *   "Irix" are used here for identification purposes only.
+ *   application to the SGI IRIX operating system.  The names "SGI" and
+ *   "IRIX" are used here for identification purposes only.
+ *
+ *   IRIX mediad interaction added by Andrea Suatoni
+ *   E-mail: a.suatoni@telefonica.net
  */
 #ifndef LINT
 static char *_os_irix_c_ident_ = "@(#)os_irix.c	6.49 02/08/08";
@@ -41,6 +44,7 @@
 extern FILE		*errfp;
 extern di_client_t	*di_clinfo;
 
+STATIC int	exclusiveuse_id = -1;		/* mediad exclusive use id */
 
 /*
  * pthru_send
@@ -219,6 +223,11 @@
 		return NULL;
 	}
 
+	/* Try to get an exclusive access id from mediad for this device */
+	exclusiveuse_id = mediad_get_exclusiveuse(path, "xmcd");
+	if (mediad_last_error() != 0)
+		exclusiveuse_id = -1;
+
 	return (devp);
 }
 
@@ -236,8 +245,14 @@
 void
 pthru_close(di_dev_t *devp)
 {
-	if (devp->fd > 0)
+	if (devp->fd > 0) {
+		/* Release the exclusive use for this device */
+		if (exclusiveuse_id != -1) {
+			mediad_release_exclusiveuse(exclusiveuse_id);
+			exclusiveuse_id = -1;
+		}
 		(void) close(devp->fd);
+	}
 	di_devfree(devp);
 }
 
@@ -325,7 +340,7 @@
 char *
 pthru_vers(void)
 {
-	return ("OS module for SGI Irix");
+	return ("OS module for SGI IRIX");
 }
 
 #endif	/* sgi DI_SCSIPT DEMO_ONLY */
--- ./libdi_d/config.sh	Fri Nov 22 21:56:44 2002
+++ ../xmcd-3.2.0/./libdi_d/config.sh	Wed Jan  1 12:10:30 2003
@@ -31,9 +31,9 @@
 VER=3.2.0
 
 # Change the following directory to fit your local configuration
-BINDIR=/usr/bin/X11
-XMCDLIB=/usr/lib/X11/xmcd
-DISCOGDIR=/usr/lib/X11/xmcd/discog
+BINDIR=/usr/freeware/bin
+XMCDLIB=/usr/freeware/lib/X11/xmcd
+DISCOGDIR=/usr/freeware/lib/X11/xmcd/discog
 XMCD_URL=http://www.amb.org/xmcd/
 
 ERRFILE=/tmp/xmcd.err
@@ -55,7 +55,7 @@
 	then
 		rm -f $CFGDIR/common.cfg.old
 		$ECHO "\n\nXmcd set-up is now complete.\n"
-		$ECHO "Please read the DRIVES file supplied with the xmcd"
+		$ECHO "Please read the $XMCDLIB/docs/DRIVES file supplied with the xmcd"
 		$ECHO "distribution for hardware configuration information"
 		$ECHO "about specific drives.\n"
 	else
@@ -1903,7 +1903,7 @@
 		;;
 	2)	$ECHO "Solaris audio driver"
 		;;
-	3)	$ECHO "Irix audio driver"
+	3)	$ECHO "IRIX audio driver"
 		;;
 	4)	$ECHO "HP-UX audio driver"
 		;;
--- ./cda_d/Imakefile	Fri Nov 22 21:57:00 2002
+++ ../xmcd-3.2.0/./cda_d/Imakefile	Wed Jan  1 12:10:30 2003
@@ -108,7 +108,7 @@
  * Add needed libraries
  */
 CDDBLIB= -L../cddb_d -lcddb
-LOCAL_LIBDIR= -L/usr/local/lib
+LOCAL_LIBDIR= -L/usr/freeware/lib32
 VORBLIB= -lvorbisenc -lvorbis -logg
 
 /* Add the following if -DUSE_LIBMP3LAME is defined in cdda_d/Imakefile.
@@ -137,7 +137,7 @@
 SYS_LIBRARIES= $(CDDBLIB) $(LOCAL_LIBDIR) $(LAMELIB) $(VORBLIB) -liconv -lm
 #else
 #if defined(SGIArchitecture)
-SYS_LIBRARIES= $(CDDBLIB) $(LOCAL_LIBDIR) $(LAMELIB) $(VORBLIB) -laudio -lm
+SYS_LIBRARIES= $(CDDBLIB) $(LOCAL_LIBDIR) $(LAMELIB) $(VORBLIB) -laudio -lmediad -lm
 #else
 SYS_LIBRARIES= $(CDDBLIB) $(LOCAL_LIBDIR) $(LAMELIB) $(VORBLIB) -lm
 #endif	/* SGI Irix */
--- ./cdda_d/Imakefile	Fri Nov 22 21:56:40 2002
+++ ../xmcd-3.2.0/./cdda_d/Imakefile	Wed Jan  1 12:10:30 2003
@@ -91,7 +91,7 @@
     defined(SVR4Architecture) || SystemV4 || \
     (defined(SCOArchitecture) && OSMajorVersion >= 5) || \
     defined(i386Sco325Architecture)
-DEFINES= -DHAS_SETEUID -DHAS_LAME -DHAS_VORBIS
+DEFINES= -DHAS_SETEUID -DHAS_VORBIS
 #else
 #if defined(OsfArchitecture) || defined(OSF1Architecture)
 DEFINES= -DBSDCOMPAT -DHAS_SETEUID -DHAS_MMS -DHAS_LAME -DHAS_VORBIS
@@ -130,7 +130,7 @@
 #if defined(OsfArchitecture) || defined(OSF1Architecture)
 INCLUDES=-I.. -I/usr/include/mme -I/usr/local/include
 #else
-INCLUDES=-I.. -I/usr/local/include
+INCLUDES=-I.. -I/usr/freeware/include
 #endif	/* OSF1 */
 #endif  /* Linux */
 #endif  /* BSD/OS */
--- ./cdda_d/cdda.h	Fri Nov 22 21:56:40 2002
+++ ../xmcd-3.2.0/./cdda_d/cdda.h	Wed Jan  1 12:10:30 2003
@@ -67,7 +67,7 @@
 #define CDDA_WR_SOL	2	/* Sun Solaris audio driver method */
 #endif
 #ifdef sgi
-#define CDDA_WR_IRIX	3	/* SGI Irix audio driver method */
+#define CDDA_WR_IRIX	3	/* SGI IRIX audio driver method */
 #endif
 #ifdef __hpux
 #define CDDA_WR_HPUX	4	/* HP-UX audio driver method */
--- ./cdda_d/wr_irix.h	Fri Nov 22 21:56:41 2002
+++ ../xmcd-3.2.0/./cdda_d/wr_irix.h	Wed Jan  1 12:10:30 2003
@@ -20,7 +20,7 @@
  */
 
 /*
- *   SGI Irix sound driver support
+ *   SGI IRIX sound driver support
  */
 #ifndef	__WR_IRIX_H__
 #define	__WR_IRIX_H__
--- ./cdda_d/wr_irix.c	Fri Nov 22 21:56:41 2002
+++ ../xmcd-3.2.0/./cdda_d/wr_irix.c	Wed Jan  1 12:10:30 2003
@@ -20,7 +20,10 @@
  */
 
 /*
- *   SGI Irix sound driver support
+ *   SGI IRIX sound driver support
+ *
+ *   Volume and balance control added by Andrea Suatoni
+ *   E-mail: a.suatoni@telefonica.net
  */
 #ifndef LINT
 static char *_wr_irix_c_ident_ = "@(#)wr_irix.c	7.17 02/11/13";
@@ -47,6 +50,10 @@
 
 STATIC ALconfig		irix_config;		/* Audio config */
 STATIC ALport		irix_port = NULL;	/* Audio port */
+STATIC double		irix_vol_step;		/* Volume stepping */
+STATIC double		irix_min_vol;		/* Minimum volume value */
+STATIC double		irix_max_vol;		/* Maximum volume value */
+STATIC bool_t		irix_has_ninf;		/* Support of -inf value */
 STATIC int		irix_wsemid;		/* Semaphores identifier */
 STATIC pid_t		irix_pipe_pid = -1;	/* Pipe to program pid */
 STATIC cd_state_t	*irix_wcd;		/* Shared memory pointer */
@@ -60,6 +67,33 @@
 
 
 /*
+ * irixaud_get_volume_params
+ *	Get the minimum, maximum and stepping values for the IRIX audio device.
+ *
+ * Args:
+ *	audiodev  - Audio device id
+ *
+ * Return:
+ *	Nothing.
+ */
+STATIC bool_t
+irixaud_get_volume_params(int audiodev)
+{
+	ALparamInfo	pi;
+
+	if (alGetParamInfo(audiodev, AL_GAIN, &pi) < 0)
+		return FALSE;
+
+	irix_has_ninf = (pi.specialVals & AL_NEG_INFINITY_BIT) != 0;
+	irix_min_vol = alFixedToDouble(pi.min.ll);
+	irix_max_vol = alFixedToDouble(pi.max.ll);
+	irix_vol_step = alFixedToDouble(pi.minDelta.ll);
+
+	return TRUE;
+}
+
+
+/*
  * irixaud_open_dev
  *	Opens the audio device.
  *
@@ -150,6 +184,16 @@
 		return FALSE;
 	}
 
+	/* Get the minimum and maximum volume values for this device */
+	if (! irixaud_get_volume_params(audiodev)) {
+		(void) sprintf(irix_wcd->i->msgbuf,
+			    "irixaud_open_dev: Cannot get min/max volume values\n%s",
+			    alGetErrorString(oserror()));
+		DBGPRN(DBG_SND)(errfp, "%s\n", irix_wcd->i->msgbuf);
+		(void) gen_reset_eid(irix_wcd);
+		return FALSE;
+	}
+
 	DBGPRN(DBG_GEN|DBG_SND)(errfp, "\nOpened audio device [%d]\n",
 				audiodev);
 
@@ -175,6 +219,7 @@
 	if (!gen_set_eid(irix_wcd))
 		return FALSE;
 
+	/* Close the port */
 	if (irix_port != NULL) {
 		/* Drain audio */
 		while (alGetFilled(irix_port) > 0)
@@ -193,6 +238,98 @@
 
 
 /*
+ * irixaud_get_device
+ *	Get audio device id.
+ *
+ * Args:
+ *	None
+ *
+ * Return:
+ *	-1         - failure
+ *	Device id  - success
+ */
+STATIC int
+irixaud_get_device()
+{
+	int	audiodev;
+
+	/* Retrieve the audio device */
+	if ((audiodev = alGetDevice(irix_config)) < 0) {
+		(void) sprintf(irix_wcd->i->msgbuf,
+			    "irixaud_get_device: Cannot get device:\n%s",
+			    alGetErrorString(oserror()));
+		DBGPRN(DBG_SND)(errfp, "%s\n", irix_wcd->i->msgbuf);
+	}
+
+	return audiodev;
+}
+
+
+/*
+ * irixaud_get_volume
+ *	Convert IRIX audio device L/R volumes to xmcd individual channel
+ *	volume percentage values.
+ *
+ * Args:
+ *	audiodev  - Audio device id
+ *
+ * Return:
+ *	Nothing.
+ */
+STATIC void
+irixaud_get_volume(int audiodev)
+{
+	ALfixed	gain[2];
+	ALpv	p[1];
+	double	range;
+	double	leftVol;
+	double	rightVol;
+	double	mainVol;
+
+	/* Get the minimum and maximum volume values for this device */
+	if (irix_vol_step == -1) {
+		if (! irixaud_get_volume_params(audiodev))
+			return;
+	}
+
+	/* Get the current gain values */
+	p[0].param = AL_GAIN;
+	p[0].value.ptr = gain;
+	p[0].sizeIn = 2;
+	if (alGetParams(audiodev, p, 1) < 0)
+		return;
+
+	/* Update volume and balance */
+	if (irix_has_ninf && gain[0] == AL_NEG_INFINITY)
+		leftVol = irix_min_vol;
+	else
+		leftVol = alFixedToDouble(gain[0]);
+
+	if (irix_has_ninf && gain[1] == AL_NEG_INFINITY)
+		rightVol = irix_min_vol;
+	else
+		rightVol = alFixedToDouble(gain[1]);
+
+	range = irix_max_vol - irix_min_vol;
+
+	if (leftVol > rightVol)
+		mainVol = leftVol;
+	else
+		mainVol = rightVol;
+
+	irix_wcd->i->vol = util_untaper_vol(
+		(int) (100 * (mainVol - irix_min_vol) / range)
+	);
+	if ((mainVol - irix_min_vol) >= irix_vol_step) {
+		irix_wcd->i->vol_left = (int)
+		  (100 * (leftVol - irix_min_vol) / (mainVol - irix_min_vol));
+		irix_wcd->i->vol_right = (int)
+		  (100 * (rightVol - irix_min_vol) / (mainVol - irix_min_vol));
+	}
+}
+
+
+/*
  * irixaud_config
  *	Sets up audio device for playing CD quality audio.
  *
@@ -207,15 +344,10 @@
 irixaud_config(void)
 {
 	int	audiodev;
-	ALpv	p[1];
+	ALpv	p[2];
 
-	if ((audiodev = alGetDevice(irix_config)) < 0) {
-		(void) sprintf(irix_wcd->i->msgbuf,
-			    "irixaud_config: Cannot get device:\n%s",
-			    alGetErrorString(oserror()));
-		DBGPRN(DBG_SND)(errfp, "%s\n", irix_wcd->i->msgbuf);
+	if ((audiodev = irixaud_get_device()) < 0)
 		return FALSE;
-	}
 
 	if (alSetSampFmt(irix_config, AL_SAMPFMT_TWOSCOMP) < 0) {
 		(void) sprintf(irix_wcd->i->msgbuf,
@@ -241,10 +373,12 @@
 		return FALSE;
 	}
 
-	p[0].param = AL_OUTPUT_RATE;
+	p[0].param = AL_RATE;
 	p[0].value.ll = alDoubleToFixed(44100.0);
+	p[1].param = AL_MASTER_CLOCK;
+	p[1].value.i = AL_CRYSTAL_MCLK_TYPE;
 
-	if (alSetParams(audiodev, p, 1) < 0) {
+	if (alSetParams(audiodev, p, 2) < 0) {
 		(void) sprintf(irix_wcd->i->msgbuf,
 			    "irixaud_config: Cannot set sampling rate:\n%s",
 			    alGetErrorString(oserror()));
@@ -252,6 +386,9 @@
 		return FALSE;
 	}
 
+	/* Update the volume and balance sliders */
+	irixaud_get_volume(audiodev);
+
 	return TRUE;
 }
 
@@ -495,6 +632,9 @@
 			  "\nirixaud_cleanup: Cleaning up writer pid=%d\n",
 			  (int) getpid());
 
+	/* Clear any alarms */
+	alarm(0);
+
 	if (irix_port != NULL)
 		(void) irixaud_close_dev();
 
@@ -551,6 +691,102 @@
 
 
 /*
+ * irixaud_status
+ *	SIGALRM signal handler. Updates volume and balance.
+ *
+ * Args:
+ *	signo - The signal number
+ *
+ * Return:
+ *	Nothing.
+ */
+/*ARGSUSED*/
+STATIC void
+irixaud_status(int signo)
+{
+	int	audiodev;
+
+	/* Get the audio device */
+	if ((audiodev = irixaud_get_device()) < 0)
+		return;
+
+	/* Update the volume and balance sliders */
+	irixaud_get_volume(audiodev);
+
+	/* Register alarm */
+	(void) alarm(1);
+}
+
+
+/*
+ * irixaud_update
+ *	SIGUSR1 signal handler. Updates volume and balance settings.
+ *
+ * Args:
+ *	signo - The signal number
+ *
+ * Return:
+ *	Nothing.
+ */
+/*ARGSUSED*/
+STATIC void
+irixaud_update(int signo)
+{
+	int	audiodev;
+	int	vol;
+	ALfixed	gain[2];
+	ALpv	p[1];
+	double	range;
+	double	leftVol;
+	double	rightVol;
+	double	mainVol;
+
+	/* Get the audio device */
+	if ((audiodev = irixaud_get_device()) < 0)
+		return;
+
+	/* Get the minimum and maximum volume values for this device */
+	if (irix_vol_step == -1) {
+		if (! irixaud_get_volume_params(audiodev))
+			return;
+	}
+
+	app_data.vol_taper = irix_wcd->i->vol_taper;
+	range = irix_max_vol - irix_min_vol;
+
+	/* Convert the current xmcd volume and balance into IRIX L/R gains */
+	if ((vol = util_taper_vol(irix_wcd->i->vol)) == 0) {
+		if (irix_has_ninf) {
+			gain[0] = AL_NEG_INFINITY;
+			gain[1] = AL_NEG_INFINITY;
+		}
+		else {
+			gain[0] = alDoubleToFixed(irix_min_vol);
+			gain[1] = alDoubleToFixed(irix_min_vol);
+		}
+	}
+	else {
+		mainVol = range *
+			  ((double) util_taper_vol(irix_wcd->i->vol) / 100);
+		leftVol = (mainVol * irix_wcd->i->vol_left / 100);
+		rightVol = (mainVol * irix_wcd->i->vol_right / 100);
+		gain[0] = alDoubleToFixed(
+			leftVol - fmod(leftVol, irix_vol_step) + irix_min_vol
+		);
+		gain[1] = alDoubleToFixed(
+			rightVol - fmod(rightVol, irix_vol_step) + irix_min_vol
+		);
+	}
+
+	/* Set the volume */
+	p[0].param = AL_GAIN;
+	p[0].value.ptr = gain;
+	p[0].sizeIn = 2;
+	alSetParams(audiodev, p, 1);
+}
+
+
+/*
  * irix_writeinit
  *	Pre-playback support check function
  *
@@ -583,7 +819,9 @@
 bool_t
 irix_write(curstat_t *s)
 {
-	size_t	estlen;
+	size_t			estlen;
+	struct sigaction	action_alrm,
+				action_usr1;
 
 	if (!PLAYMODE_IS_CDDA(app_data.play_mode)) {
 		(void) fprintf(errfp, "irix_write: Nothing to do.\n");
@@ -709,6 +947,36 @@
 			irixaud_cleanup(TRUE);
 			return FALSE;
 		}
+
+		/* Initial settings */
+		irixaud_update(SIGUSR1);
+
+		/* Install SIGUSR1 signal handler */
+		action_usr1.sa_handler = irixaud_update;
+		sigemptyset(&action_usr1.sa_mask);
+		action_usr1.sa_flags = 0;
+		if (sigaction(SIGUSR1, &action_usr1, NULL) < 0) {
+			(void) fprintf(errfp,
+				"irix_write: sigaction failed (SIGUSR1): %s\n",
+				strerror(errno));
+			irixaud_cleanup(TRUE);
+			return FALSE;
+		}
+
+		/* Install SIGALRM signal handler */
+		action_alrm.sa_handler = irixaud_status;
+		sigemptyset(&action_alrm.sa_mask);
+		action_alrm.sa_flags = 0;
+		if (sigaction(SIGALRM, &action_alrm, NULL) < 0) {
+			(void) fprintf(errfp,
+				"irix_write: sigaction failed (SIGALRM): %s\n",
+				strerror(errno));
+			irixaud_cleanup(TRUE);
+			return FALSE;
+		}
+
+		/* Register alarm */
+		(void) alarm(1);
 	}
 
 	/* Do the writing */
@@ -748,7 +1016,7 @@
 void
 irix_winfo(char *str)
 {
-	(void) strcat(str, "SGI Irix sound driver\n");
+	(void) strcat(str, "SGI IRIX sound driver\n");
 }
 
 #endif	/* CDDA_WR_IRIX CDDA_SYSVIPC */
--- ./util_d/gobrowser.c	Fri Nov 22 21:57:01 2002
+++ ../xmcd-3.2.0/./util_d/gobrowser.c	Wed Jan  1 12:10:30 2003
@@ -74,6 +74,9 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+#if defined(USE_SGI_DESKTOP)
+#include <X11/SGIScheme.h>
+#endif
 
 #ifdef sony_news
 typedef int			pid_t;
@@ -125,6 +128,7 @@
  */
 char	*search_paths[] = {
 	"/usr/bin/X11",
+	"/usr/freeware/bin",
 	"/usr/X/bin",
 	"/usr/X11/bin",
 	"/usr/X11R6/bin",
@@ -361,6 +365,9 @@
 				junk;
 	unsigned int		keybtn;
 
+#if defined(USE_SGI_DESKTOP)
+	SgiUseSchemes("all");
+#endif
 	toplevel = XtVaAppInitialize(
 		&app_context,
 		"GObrowser",
--- ./make.inc	Fri Nov 22 21:56:38 2002
+++ ../xmcd-3.2.0/./make.inc	Wed Jan  1 12:10:30 2003
@@ -63,30 +63,30 @@
 # these defines.
 #
 SHELL=		/bin/sh
-MAKE=		make
+MAKE=		$(MAKE)
 CC=		cc
 RANLIB=		/bin/true
 AR=		ar cq
 RM=		rm -f
 LN=		ln -s
-CFLAGS=		-O $(DEFINES) $(INCDIRS) $(ARCH) $(TIMER) $(TERMIO) $(MISC)
+CFLAGS=		-O3 -OPT:space=ON:Olimit=0 $(DEFINES) $(INCDIRS) $(ARCH) $(TIMER) $(TERMIO) $(MISC)
 ARCH=		-DSVR4 -Di386
-MISC=		-DHAS_SETEUID -DHAS_ICONV -DHAS_LAME -DHAS_VORBIS
+MISC=		-DHAS_SETEUID -DHAS_ICONV -DHAS_VORBIS -DNO_LABELH -DUSE_SGI_DESKTOP
 TIMER=		-DUSE_SELECT
 TERMIO=		-DUSE_TERMIOS
-INCDIRS=	-I.. -I/usr/X/include -I/usr/local/include
-LOCAL_LIBDIR=	-L/usr/local/lib
+INCDIRS=	-I.. -I/usr/include/X11 -I/usr/freeware/include
+LOCAL_LIBDIR=	-s -L/usr/freeware/lib32
 CDDBLIB=	-L../cddb_d -lcddb
 VORBLIB=	-lvorbisenc -lvorbis -logg
 # LAMELIB=	-lmp3lame
-# AUDIOLIB=	-lasound
-XLIBS=		-L/usr/X/lib -lXm -lXt -lX11 -lgen
+AUDIOLIB=	-laudio -lmediad
+XLIBS=		-lXm -lXt -lX11 -lgen
 CURSESLIB=	-lcurses
 SOCKETLIB=	-lsocket -lnsl
 MATHLIB=	-lm
-BINDIR=		/usr/bin/X11
-LIBDIR=		/usr/lib/X11
-MANDIR=		/usr/man/man1
+BINDIR=		/usr/freeware/bin
+LIBDIR=		/usr/freeware/lib/X11
+MANDIR=		/usr/freeware/catman/u_man/cat1
 MANSUF=		.1
 DEPEND=		makedepend
 DEPENDFLAGS=
--- ./misc_d/start.sh	Fri Nov 22 21:57:01 2002
+++ ../xmcd-3.2.0/./misc_d/start.sh	Wed Jan  1 12:10:30 2003
@@ -123,7 +123,9 @@
 
 PROG=`(basename $0) 2>/dev/null`
 SYS=`(uname -s) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
-MACH=`(uname -m) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
+# On IRIX, do not differentiate on the machine hardware
+# MACH=`(uname -m) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
+MACH=ALL
 REL=`(uname -r) 2>/dev/null | sed -e 's/\//_/g' -e 's/-/_/g' -e 's/[ 	]/_/g'`
 
 o_path=$PATH
--- ./xmcd_d/Imakefile	Fri Nov 22 21:56:49 2002
+++ ../xmcd-3.2.0/./xmcd_d/Imakefile	Wed Jan  1 12:10:30 2003
@@ -45,7 +45,7 @@
  */
 
 CDDBLIB= -L../cddb_d -lcddb
-LOCAL_LIBDIR= -L/usr/local/lib
+LOCAL_LIBDIR= -L/usr/freeware/lib32
 VORBLIB= -lvorbisenc -lvorbis -logg
 
 /* Add the following if -DUSE_LIBMP3LAME is defined in cdda_d/Imakefile.
@@ -74,7 +74,7 @@
 SYS_LIBRARIES= $(CDDBLIB) $(LOCAL_LIBDIR) $(LAMELIB) $(VORBLIB) -liconv -lm
 #else
 #if defined(SGIArchitecture)
-SYS_LIBRARIES= $(CDDBLIB) $(LOCAL_LIBDIR) $(LAMELIB) $(VORBLIB) -laudio -lm
+SYS_LIBRARIES= $(CDDBLIB) $(LOCAL_LIBDIR) $(LAMELIB) $(VORBLIB) -laudio -lmediad -lm
 #else
 SYS_LIBRARIES= $(CDDBLIB) $(LOCAL_LIBDIR) $(LAMELIB) $(VORBLIB) -lm
 #endif	/* SGI Irix */
--- ./xmcd_d/xmcd.man	Fri Nov 22 21:56:51 2002
+++ ../xmcd-3.2.0/./xmcd_d/xmcd.man	Wed Jan  1 12:10:31 2003
@@ -782,7 +782,7 @@
 (\fIxmcd\fR version 1.x through 3.0) supported.
 .sp
 .TP
-\fI\CDDA playback\fR
+\fICDDA playback\fR
 .br
 When playing a CD in this mode,
 .I xmcd
@@ -796,7 +796,7 @@
 volume control slider bar affects the computer's DSP device.
 .sp
 .TP
-\fI\CDDA save to file\fR
+\fICDDA save to file\fR
 .br
 When playing a CD in this mode,
 .I xmcd
@@ -826,7 +826,7 @@
 it depends on the CPU performance of your system.
 .sp
 .TP
-\fI\CDDA pipe to program\fR
+\fICDDA pipe to program\fR
 .br
 When playing a CD in this mode,
 .I xmcd
--- ./xmcd_d/cdfunc.c	Fri Nov 22 21:56:50 2002
+++ ../xmcd-3.2.0/./xmcd_d/cdfunc.c	Wed Jan  1 12:10:30 2003
@@ -2718,7 +2718,11 @@
 	if (str[0] == '\0')
 		(void) strcpy(icontitle, PROGNAME);
 	else
+#if defined(USE_SGI_DESKTOP)
+		(void) strcpy(icontitle, str);
+#else
 		(void) sprintf(icontitle, "%s: %s", PROGNAME, str);
+#endif
 
 	XtVaSetValues(widgets.toplevel,
 		XmNiconName, icontitle,
--- ./xmcd_d/geom.h	Fri Nov 22 21:56:50 2002
+++ ../xmcd-3.2.0/./xmcd_d/geom.h	Wed Jan  1 12:10:31 2003
@@ -26,9 +26,12 @@
 static char *_geom_h_ident_ = "@(#)geom.h	7.78 02/11/18";
 #endif
 
-
 /* Height of toggle button widgets */
+#if defined(USE_SGI_DESKTOP)
+#define TOGGLE_HEIGHT1		22
+#else
 #define TOGGLE_HEIGHT1		16
+#endif
 #define TOGGLE_HEIGHT2		18
 
 
@@ -398,7 +401,11 @@
 #define TOFF_MODEFMT_OPT	6
 
 #define LOFF_PERFMON_BTN	30
+#if defined(USE_SGI_DESKTOP)
+#define TOFF_PERFMON_BTN	3
+#else
 #define TOFF_PERFMON_BTN	5
+#endif
 
 #define LOFF_PATH_LBL		10
 #define ROFF_PATH_LBL		10
@@ -405,7 +412,11 @@
 #define TOFF_PATH_LBL		3
 
 #define LOFF_PATH_TXT		10
+#if defined(USE_SGI_DESKTOP)
+#define ROFF_PATH_TXT		95
+#else
 #define ROFF_PATH_TXT		75
+#endif
 #define TOFF_PATH_TXT		0
 
 #define ROFF_PATHEXP_BTN	10
--- ./xmcd_d/geom.c	Fri Nov 22 21:56:50 2002
+++ ../xmcd-3.2.0/./xmcd_d/geom.c	Wed Jan  1 12:10:30 2003
@@ -1236,30 +1236,40 @@
 		XmNrightPosition, RIGHT_MODE_CHKFRM,
 		XmNtopWidget, m->options.mode_lbl,
 		XmNtopOffset, TOFF_MODE_CHKFRM,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, HEIGHT_MODE_CHKFRM,
+#endif
 		XmNshadowType, XmSHADOW_ETCHED_IN,
 		NULL
 	);
 	XtVaSetValues(m->options.mode_std_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		XmNindicatorType, XmONE_OF_MANY,
 		NULL
 	);
 	XtVaSetValues(m->options.mode_cdda_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		XmNindicatorType, XmN_OF_MANY,
 		NULL
 	);
 	XtVaSetValues(m->options.mode_file_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		XmNindicatorType, XmN_OF_MANY,
 		NULL
 	);
 	XtVaSetValues(m->options.mode_pipe_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		XmNindicatorType, XmN_OF_MANY,
 		NULL
@@ -1774,17 +1784,23 @@
 		XmNrightPosition, RIGHT_SCHED_RD_RADFRM,
 		XmNtopWidget, m->options.sched_rd_lbl,
 		XmNtopOffset, TOFF_SCHED_RD_RADFRM,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, HEIGHT_SCHED_RD_RADFRM,
+#endif
 		XmNshadowType, XmSHADOW_ETCHED_IN,
 		NULL
 	);
 	XtVaSetValues(m->options.sched_rd_norm_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.sched_rd_hipri_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
@@ -1810,17 +1826,23 @@
 		XmNrightPosition, RIGHT_SCHED_WR_RADFRM,
 		XmNtopWidget, m->options.sched_wr_lbl,
 		XmNtopOffset, TOFF_SCHED_WR_RADFRM,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, HEIGHT_SCHED_WR_RADFRM,
+#endif
 		XmNshadowType, XmSHADOW_ETCHED_IN,
 		NULL
 	);
 	XtVaSetValues(m->options.sched_wr_norm_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.sched_wr_hipri_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
@@ -1881,29 +1903,39 @@
 		XmNtopWidget, m->options.load_lbl,
 		XmNtopOffset, TOFF_LOAD_CHKFRM,
 		XmNshadowType, XmSHADOW_ETCHED_IN,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, HEIGHT_LOAD_CHKFRM,
+#endif
 		NULL
 	);
 	XtVaSetValues(m->options.load_none_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		XmNindicatorType, XmONE_OF_MANY,
 		NULL
 	);
 	XtVaSetValues(m->options.load_spdn_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		XmNindicatorType, XmONE_OF_MANY,
 		NULL
 	);
 	XtVaSetValues(m->options.load_play_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		XmNindicatorType, XmONE_OF_MANY,
 		NULL
 	);
 	XtVaSetValues(m->options.load_lock_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		XmNindicatorType, XmN_OF_MANY,
 		NULL
@@ -1930,12 +1962,16 @@
 		XmNrightPosition, RIGHT_EJECT_CHKFRM,
 		XmNtopWidget, m->options.eject_lbl,
 		XmNtopOffset, TOFF_EJECT_CHKFRM,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, HEIGHT_EJECT_CHKFRM,
+#endif
 		XmNshadowType, XmSHADOW_ETCHED_IN,
 		NULL
 	);
 	XtVaSetValues(m->options.eject_exit_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
@@ -1960,17 +1996,23 @@
 		XmNrightPosition, RIGHT_DONE_CHKFRM,
 		XmNtopWidget, m->options.done_lbl,
 		XmNtopOffset, TOFF_DONE_CHKFRM,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, HEIGHT_DONE_CHKFRM,
+#endif
 		XmNshadowType, XmSHADOW_ETCHED_IN,
 		NULL
 	);
 	XtVaSetValues(m->options.done_eject_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.done_exit_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
@@ -1997,22 +2039,30 @@
 		XmNrightPosition, RIGHT_EXIT_RADFRM,
 		XmNtopWidget, m->options.exit_lbl,
 		XmNtopOffset, TOFF_EXIT_RADFRM,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, HEIGHT_EXIT_RADFRM,
+#endif
 		XmNshadowType, XmSHADOW_ETCHED_IN,
 		NULL
 	);
 	XtVaSetValues(m->options.exit_none_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.exit_stop_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.exit_eject_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
@@ -2037,17 +2087,23 @@
 		XmNrightPosition, RIGHT_CHG_CHKFRM,
 		XmNtopWidget, m->options.chg_lbl,
 		XmNtopOffset, TOFF_CHG_CHKFRM,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, HEIGHT_CHG_CHKFRM,
+#endif
 		XmNshadowType, XmSHADOW_ETCHED_IN,
 		NULL
 	);
 	XtVaSetValues(m->options.chg_multiplay_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.chg_reverse_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
@@ -2072,32 +2128,44 @@
 		XmNrightPosition, RIGHT_CHROUTE_RADFRM,
 		XmNtopWidget, m->options.chroute_lbl,
 		XmNtopOffset, TOFF_CHROUTE_RADFRM,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, HEIGHT_CHROUTE_RADFRM,
+#endif
 		XmNshadowType, XmSHADOW_ETCHED_IN,
 		NULL
 	);
 	XtVaSetValues(m->options.chroute_stereo_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.chroute_rev_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.chroute_left_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.chroute_right_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.chroute_mono_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
@@ -2122,22 +2190,30 @@
 		XmNrightPosition, RIGHT_VOLTP_RADFRM,
 		XmNtopWidget, m->options.vol_lbl,
 		XmNtopOffset, TOFF_VOLTP_RADFRM,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, HEIGHT_VOLTP_RADFRM,
+#endif
 		XmNshadowType, XmSHADOW_ETCHED_IN,
 		NULL
 	);
 	XtVaSetValues(m->options.vol_linear_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.vol_square_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.vol_invsqr_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
@@ -2234,17 +2310,23 @@
 		XmNrightPosition, RIGHT_MBROWSER_FRM,
 		XmNtopWidget, m->options.mbrowser_lbl,
 		XmNtopOffset, TOFF_MBROWSER_FRM,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, HEIGHT_MBROWSER_FRM,
+#endif
 		XmNshadowType, XmSHADOW_ETCHED_IN,
 		NULL
 	);
 	XtVaSetValues(m->options.autobr_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.manbr_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
@@ -2270,17 +2352,23 @@
 		XmNrightPosition, RIGHT_LOOKUP_FRM,
 		XmNtopWidget, m->options.lookup_lbl,
 		XmNtopOffset, TOFF_LOOKUP_FRM,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, HEIGHT_LOOKUP_FRM,
+#endif
 		XmNshadowType, XmSHADOW_ETCHED_IN,
 		NULL
 	);
 	XtVaSetValues(m->options.cddb_pri_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
 	XtVaSetValues(m->options.cdtext_pri_btn,
+#if ! defined(USE_SGI_DESKTOP)
 		XmNheight, TOGGLE_HEIGHT2,
+#endif
 		XmNrecomputeSize, False,
 		NULL
 	);
--- ./xmcd_d/widget.c	Fri Nov 22 21:56:50 2002
+++ ../xmcd-3.2.0/./xmcd_d/widget.c	Wed Jan  1 12:10:31 2003
@@ -465,7 +465,9 @@
 	XtSetArg(arg[i], XmNorientation, XmVERTICAL); i++;
 	XtSetArg(arg[i], XmNmarginWidth, 0); i++;
 	XtSetArg(arg[i], XmNmarginHeight, 0); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->main.wwwwarp_bar = XmCreateMenuBar(
 		m->main.form,
 		"wwwWarpMenuBar",
@@ -927,8 +929,10 @@
 
 	/* Create toggle button for jitter correction */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNheight, 18); i++;
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.mode_jitter_btn = XmCreateToggleButton(
@@ -940,8 +944,10 @@
 
 	/* Create toggle button for file per track */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNheight, 18); i++;
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.mode_trkfile_btn = XmCreateToggleButton(
@@ -953,8 +959,10 @@
 
 	/* Create toggle button for underscore substitution */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNheight, 18); i++;
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.mode_subst_btn = XmCreateToggleButton(
@@ -966,7 +974,9 @@
 
 	/* Create pulldown menu widget for file format selector */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.mode_fmt_menu = XmCreatePulldownMenu(
 		m->options.form,
 		"modeFileFormatPulldownMenu",
@@ -994,7 +1004,9 @@
 
 	/* Create pushbutton widget for RAW menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.mode_fmt_raw_btn = XmCreatePushButton(
 		m->options.mode_fmt_menu,
 		"modeFileFormatRawButton",
@@ -1004,7 +1016,9 @@
 
 	/* Create pushbutton widget for AU menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.mode_fmt_au_btn = XmCreatePushButton(
 		m->options.mode_fmt_menu,
 		"modeFileFormatAuButton",
@@ -1014,7 +1028,9 @@
 
 	/* Create pushbutton widget for WAV menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.mode_fmt_wav_btn = XmCreatePushButton(
 		m->options.mode_fmt_menu,
 		"modeFileFormatWavButton",
@@ -1024,7 +1040,9 @@
 
 	/* Create pushbutton widget for AIFF menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.mode_fmt_aiff_btn = XmCreatePushButton(
 		m->options.mode_fmt_menu,
 		"modeFileFormatAiffButton",
@@ -1034,7 +1052,9 @@
 
 	/* Create pushbutton widget for AIFF-C menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.mode_fmt_aifc_btn = XmCreatePushButton(
 		m->options.mode_fmt_menu,
 		"modeFileFormatAifcButton",
@@ -1044,7 +1064,9 @@
 
 	/* Create pushbutton widget for MP3 menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.mode_fmt_mp3_btn = XmCreatePushButton(
 		m->options.mode_fmt_menu,
 		"modeFileFormatMp3Button",
@@ -1054,7 +1076,9 @@
 
 	/* Create pushbutton widget for OGG menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.mode_fmt_ogg_btn = XmCreatePushButton(
 		m->options.mode_fmt_menu,
 		"modeFileFormatOggButton",
@@ -1066,7 +1090,9 @@
 	i = 0;
 	XtSetArg(arg[i], XmNsensitive, False); i++;
 	XtSetArg(arg[i], XmNsubMenuId, m->options.mode_fmt_menu); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.mode_fmt_opt = XmCreateOptionMenu(
@@ -1145,7 +1171,9 @@
 
 	/* Create pulldown menu widget for encoding method selector */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.method_menu = XmCreatePulldownMenu(
 		m->options.form,
 		"encodeMethodPulldownMenu",
@@ -1173,7 +1201,9 @@
 
 	/* Create pushbutton widget for CBR menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.cbr_btn = XmCreatePushButton(
 		m->options.method_menu,
 		"cbrButton",
@@ -1183,7 +1213,9 @@
 
 	/* Create pushbutton widget for VBR menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.vbr_btn = XmCreatePushButton(
 		m->options.method_menu,
 		"vbrButton",
@@ -1193,7 +1225,9 @@
 
 	/* Create pushbutton widget for VBR-2 menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.vbr2_btn = XmCreatePushButton(
 		m->options.method_menu,
 		"vbr2Button",
@@ -1203,7 +1237,9 @@
 
 	/* Create pushbutton widget for ABR menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.abr_btn = XmCreatePushButton(
 		m->options.method_menu,
 		"abrButton",
@@ -1214,7 +1250,9 @@
 	/* Create option menu widget for encode method selector */
 	i = 0;
 	XtSetArg(arg[i], XmNsubMenuId, m->options.method_menu); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.method_opt = XmCreateOptionMenu(
@@ -1271,7 +1309,9 @@
 
 	/* Create pulldown menu widget for bitrate selector */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.bitrate_menu = XmCreatePulldownMenu(
 		m->options.form,
 		"bitratePulldownMenu",
@@ -1298,7 +1338,9 @@
 	);
 
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.bitrate_def_btn = XmCreatePushButton(
 		m->options.bitrate_menu,
 		"bitrateDefaultButton",
@@ -1309,7 +1351,9 @@
 	/* Create option menu widget for bitrate selector */
 	i = 0;
 	XtSetArg(arg[i], XmNsubMenuId, m->options.bitrate_menu); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.bitrate_opt = XmCreateOptionMenu(
@@ -1321,7 +1365,9 @@
 
 	/* Create pulldown menu widget for min bitrate selector */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.minbrate_menu = XmCreatePulldownMenu(
 		m->options.form,
 		"minBitratePulldownMenu",
@@ -1348,7 +1394,9 @@
 	);
 
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.minbrate_def_btn = XmCreatePushButton(
 		m->options.minbrate_menu,
 		"minBitrateDefaultButton",
@@ -1359,7 +1407,9 @@
 	/* Create option menu widget for min bitrate selector */
 	i = 0;
 	XtSetArg(arg[i], XmNsubMenuId, m->options.minbrate_menu); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.minbrate_opt = XmCreateOptionMenu(
@@ -1371,7 +1421,9 @@
 
 	/* Create pulldown menu widget for max bitrate selector */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.maxbrate_menu = XmCreatePulldownMenu(
 		m->options.form,
 		"maxBitratePulldownMenu",
@@ -1398,7 +1450,9 @@
 	);
 
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.maxbrate_def_btn = XmCreatePushButton(
 		m->options.maxbrate_menu,
 		"maxBitrateDefaultButton",
@@ -1409,7 +1463,9 @@
 	/* Create option menu widget for bitrate selector */
 	i = 0;
 	XtSetArg(arg[i], XmNsubMenuId, m->options.maxbrate_menu); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.maxbrate_opt = XmCreateOptionMenu(
@@ -1421,7 +1477,9 @@
 
 	/* Create pulldown menu widget for MP3 mode selector */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.mp3mode_menu = XmCreatePulldownMenu(
 		m->options.form,
 		"mp3ModePulldownMenu",
@@ -1494,7 +1552,9 @@
 
 	/* Create pushbutton widget for stereo menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.mp3mode_stereo_btn = XmCreatePushButton(
 		m->options.mp3mode_menu,
 		"mp3ModeStereoButton",
@@ -1504,7 +1564,9 @@
 
 	/* Create pushbutton widget for joint-stereo menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.mp3mode_jstereo_btn = XmCreatePushButton(
 		m->options.mp3mode_menu,
 		"mp3ModeJointStereoButton",
@@ -1514,7 +1576,9 @@
 
 	/* Create pushbutton widget for forced msstereo menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.mp3mode_forcems_btn = XmCreatePushButton(
 		m->options.mp3mode_menu,
 		"mp3ModeForceMidSideButton",
@@ -1524,7 +1588,9 @@
 
 	/* Create pushbutton widget for mono menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.mp3mode_mono_btn = XmCreatePushButton(
 		m->options.mp3mode_menu,
 		"mp3ModeMonoButton",
@@ -1535,7 +1601,9 @@
 	/* Create option menu widget for MP3 mode selector */
 	i = 0;
 	XtSetArg(arg[i], XmNsubMenuId, m->options.mp3mode_menu); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.mp3mode_opt = XmCreateOptionMenu(
@@ -1585,7 +1653,9 @@
 
 	/* Create pulldown menu widget for lowpass filter selector */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.lp_menu = XmCreatePulldownMenu(
 		m->options.form,
 		"lowpassPulldownMenu",
@@ -1613,7 +1683,9 @@
 
 	/* Create pushbutton widget for lowpass off menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.lp_off_btn = XmCreatePushButton(
 		m->options.lp_menu,
 		"lowpassOffButton",
@@ -1623,7 +1695,9 @@
 
 	/* Create pushbutton widget for lowpass auto menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.lp_auto_btn = XmCreatePushButton(
 		m->options.lp_menu,
 		"lowpassAutoButton",
@@ -1633,7 +1707,9 @@
 
 	/* Create pushbutton widget for lowpass manual menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.lp_manual_btn = XmCreatePushButton(
 		m->options.lp_menu,
 		"lowpassManualButton",
@@ -1644,7 +1720,9 @@
 	/* Create option menu widget for lowpass filter selector */
 	i = 0;
 	XtSetArg(arg[i], XmNsubMenuId, m->options.lp_menu); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.lp_opt = XmCreateOptionMenu(
@@ -1684,7 +1762,9 @@
 
 	/* Create pulldown menu widget for highpass filter selector */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.hp_menu = XmCreatePulldownMenu(
 		m->options.form,
 		"highpassPulldownMenu",
@@ -1712,7 +1792,9 @@
 
 	/* Create pushbutton widget for highpass off menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.hp_off_btn = XmCreatePushButton(
 		m->options.hp_menu,
 		"highpassOffButton",
@@ -1722,7 +1804,9 @@
 
 	/* Create pushbutton widget for highpass auto menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.hp_auto_btn = XmCreatePushButton(
 		m->options.hp_menu,
 		"highpassAutoButton",
@@ -1732,7 +1816,9 @@
 
 	/* Create pushbutton widget for highpass manual menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.hp_manual_btn = XmCreatePushButton(
 		m->options.hp_menu,
 		"highpassManualButton",
@@ -1743,7 +1829,9 @@
 	/* Create option menu widget for highpass filter selector */
 	i = 0;
 	XtSetArg(arg[i], XmNsubMenuId, m->options.hp_menu); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.hp_opt = XmCreateOptionMenu(
@@ -1791,8 +1879,10 @@
 
 	/* Create toggle button for copyright button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNheight, 18); i++;
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.copyrt_btn = XmCreateToggleButton(
@@ -1804,8 +1894,10 @@
 
 	/* Create toggle button for original button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNheight, 18); i++;
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.orig_btn = XmCreateToggleButton(
@@ -1817,8 +1909,10 @@
 
 	/* Create toggle button for nores button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNheight, 18); i++;
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.nores_btn = XmCreateToggleButton(
@@ -1830,8 +1924,10 @@
 
 	/* Create toggle button for checksum button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNheight, 18); i++;
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.chksum_btn = XmCreateToggleButton(
@@ -1843,8 +1939,10 @@
 
 	/* Create toggle button for the strict ISO compliance button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNheight, 18); i++;
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.iso_btn = XmCreateToggleButton(
@@ -1856,8 +1954,10 @@
 
 	/* Create toggle button for Add CD info tag */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNheight, 18); i++;
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.addtag_btn = XmCreateToggleButton(
@@ -1869,7 +1969,9 @@
 
 	/* Create pulldown menu widget for ID3tag version selector */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.id3tag_ver_menu = XmCreatePulldownMenu(
 		m->options.form,
 		"id3tagVersionPulldownMenu",
@@ -1897,7 +1999,9 @@
 
 	/* Create pushbutton widget for ID3tag v1 menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.id3tag_v1_btn = XmCreatePushButton(
 		m->options.id3tag_ver_menu,
 		"id3tagVersion1Button",
@@ -1907,7 +2011,9 @@
 
 	/* Create pushbutton widget for ID3tag v2 menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.id3tag_v2_btn = XmCreatePushButton(
 		m->options.id3tag_ver_menu,
 		"id3tagVersion2Button",
@@ -1917,7 +2023,9 @@
 
 	/* Create pushbutton widget for ID3tag both versions menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->options.id3tag_both_btn = XmCreatePushButton(
 		m->options.id3tag_ver_menu,
 		"id3tagBothVersionsButton",
@@ -1928,7 +2036,9 @@
 	/* Create option menu widget for ID3tag version selector */
 	i = 0;
 	XtSetArg(arg[i], XmNsubMenuId, m->options.id3tag_ver_menu); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.id3tag_ver_opt = XmCreateOptionMenu(
@@ -2495,8 +2605,10 @@
 
 	/* Create toggle button for CDDB use proxy button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNheight, 18); i++;
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.use_proxy_btn = XmCreateToggleButton(
@@ -2552,8 +2664,10 @@
 
 	/* Create toggle button for proxy authorization button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNheight, 18); i++;
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->options.proxy_auth_btn = XmCreateToggleButton(
@@ -2876,8 +2990,10 @@
 
 	/* Create toggle button for CDDB remote offline */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNheight, 18); i++;
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->dbprog.inetoffln_btn = XmCreateToggleButton(
@@ -3028,7 +3144,9 @@
 
 	/* Create scrolled window widget for track list */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	m->dbprog.trklist_sw = XmCreateScrolledWindow(
 		m->dbprog.form,
 		"trackListScrolledWindow",
@@ -3361,7 +3479,9 @@
 
 	/* Create pulldown menu widget for disc list selector */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->dlist.type_menu = XmCreatePulldownMenu(
 		m->dlist.form,
 		"discListTypePulldownMenu",
@@ -3389,7 +3509,9 @@
 
 	/* Create pushbutton widget for history menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->dlist.hist_btn = XmCreatePushButton(
 		m->dlist.type_menu,
 		"discListHistoryButton",
@@ -3399,7 +3521,9 @@
 
 	/* Create pushbutton widget for changer slots menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->dlist.chgr_btn = XmCreatePushButton(
 		m->dlist.type_menu,
 		"discListChangerButton",
@@ -3410,7 +3534,9 @@
 	/* Create option menu widget for topic selector */
 	i = 0;
 	XtSetArg(arg[i], XmNsubMenuId, m->dlist.type_menu); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->dlist.type_opt = XmCreateOptionMenu(
@@ -3432,7 +3558,9 @@
 
 	/* Create scrolled window widget for disc list */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	m->dlist.disclist_sw = XmCreateScrolledWindow(
 		m->dlist.form,
 		"discListScrolledWindow",
@@ -3616,7 +3744,9 @@
 
 	/* Create toggle button for the auto-gen button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->fullname.autogen_btn = XmCreateToggleButton(
 		m->fullname.form,
@@ -3671,7 +3801,9 @@
 
 	/* Create toggle button for name "the" button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->fullname.the_btn = XmCreateToggleButton(
 		m->fullname.form,
@@ -3814,7 +3946,9 @@
 
 	/* Create toggle button for sort title "the" button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->dbextd.the_btn = XmCreateToggleButton(
 		m->dbextd.form,
@@ -3886,7 +4020,9 @@
 
 	/* Create toggle button for compilation button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->dbextd.comp_btn = XmCreateToggleButton(
 		m->dbextd.form,
@@ -3901,7 +4037,9 @@
 		/* Create pulldown menu widget for Genre selector */
 		(void) sprintf(name, "extDiscInfoGenre%dMenu", n);
 		i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 		XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 		m->dbextd.genre_menu[n] = XmCreatePulldownMenu(
 			m->dbextd.form,
 			name,
@@ -3913,7 +4051,9 @@
 		(void) sprintf(name, "extDiscInfoGenre%dOptionMenu", n);
 		i = 0;
 		XtSetArg(arg[i], XmNsubMenuId, m->dbextd.genre_menu[n]); i++;
+#if ! defined(USE_SGI_DESKTOP)
 		XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 		XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 		XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 		XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
@@ -3947,7 +4087,9 @@
 		/* Create pushbutton widget as Genre "none" button */
 		(void) sprintf(name, "extDiscInfoGenre%dNoneButton", n);
 		i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 		XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 		m->dbextd.genre_none_btn[n] = XmCreatePushButton(
 			m->dbextd.genre_menu[n],
 			name,
@@ -3958,7 +4100,9 @@
 		/* Create pulldown menu widget for Subgenre selector */
 		(void) sprintf(name, "extDiscInfoSubgenre%dMenu", n);
 		i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 		XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 		m->dbextd.subgenre_menu[n] = XmCreatePulldownMenu(
 			m->dbextd.form,
 			name,
@@ -3971,7 +4115,9 @@
 		i = 0;
 		XtSetArg(arg[i], XmNsubMenuId,
 			 m->dbextd.subgenre_menu[n]); i++;
+#if ! defined(USE_SGI_DESKTOP)
 		XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 		XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 		XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 		XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
@@ -4005,7 +4151,9 @@
 		/* Create pushbutton widget as Subgenre "none" button */
 		(void) sprintf(name, "extDiscInfoSubgenre%dNoneButton", n);
 		i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 		XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 		m->dbextd.subgenre_none_btn[n] = XmCreatePushButton(
 			m->dbextd.subgenre_menu[n],
 			name,
@@ -4285,7 +4433,9 @@
 
 	/* Create toggle button for auto-track */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->dbextt.autotrk_btn = XmCreateToggleButton(
 		m->dbextt.form,
@@ -4368,7 +4518,9 @@
 
 	/* Create toggle button for sort title "the" button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->dbextt.the_btn = XmCreateToggleButton(
 		m->dbextt.form,
@@ -4500,7 +4652,9 @@
 		/* Create pulldown menu widget for Genre selector */
 		(void) sprintf(name, "extTrackInfoGenre%dMenu", n);
 		i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 		XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 		m->dbextt.genre_menu[n] = XmCreatePulldownMenu(
 			m->dbextt.form,
 			name,
@@ -4512,7 +4666,9 @@
 		(void) sprintf(name, "extTrackInfoGenre%dOptionMenu", n);
 		i = 0;
 		XtSetArg(arg[i], XmNsubMenuId, m->dbextt.genre_menu[n]); i++;
+#if ! defined(USE_SGI_DESKTOP)
 		XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 		XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 		XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 		XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
@@ -4546,7 +4702,9 @@
 		/* Create pushbutton widget as Genre "none" button */
 		(void) sprintf(name, "extTrackInfoGenre%dNoneButton", n);
 		i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 		XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 		m->dbextt.genre_none_btn[n] = XmCreatePushButton(
 			m->dbextt.genre_menu[n],
 			name,
@@ -4557,7 +4715,9 @@
 		/* Create pulldown menu widget for Subgenre selector */
 		(void) sprintf(name, "extTrackInfoSubgenre%dMenu", n);
 		i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 		XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 		m->dbextt.subgenre_menu[n] = XmCreatePulldownMenu(
 			m->dbextt.form,
 			name,
@@ -4570,7 +4730,9 @@
 		i = 0;
 		XtSetArg(arg[i], XmNsubMenuId,
 			 m->dbextt.subgenre_menu[n]); i++;
+#if ! defined(USE_SGI_DESKTOP)
 		XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 		XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 		XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 		XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
@@ -4604,7 +4766,9 @@
 		/* Create pushbutton widget as Subgenre "none" button */
 		(void) sprintf(name, "extTrackInfoSubgenre%dNoneButton", n);
 		i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 		XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 		m->dbextt.subgenre_none_btn[n] = XmCreatePushButton(
 			m->dbextt.subgenre_menu[n],
 			name,
@@ -4757,7 +4921,9 @@
 
 	/* Create toggle button for auto-track */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->credits.autotrk_btn = XmCreateToggleButton(
 		m->credits.form,
@@ -4820,7 +4986,9 @@
 	XtSetArg(arg[i], XmNselectionPolicy, XmBROWSE_SELECT); i++;
 	XtSetArg(arg[i], XmNlistSizePolicy, XmCONSTANT); i++;
 	XtSetArg(arg[i], XmNscrollBarDisplayPolicy, XmSTATIC); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNscrolledWindowMarginWidth, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->credits.cred_list = XmCreateScrolledList(
 		m->credits.form,
@@ -4847,7 +5015,9 @@
 
 	/* Create pulldown menu widget for Role category selector */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->credits.prirole_menu = XmCreatePulldownMenu(
 		m->credits.form,
 		"creditsPrimaryRolePulldownMenu",
@@ -4858,7 +5028,9 @@
 	/* Create option menu widget for Role category selector */
 	i = 0;
 	XtSetArg(arg[i], XmNsubMenuId, m->credits.prirole_menu); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
@@ -4889,7 +5061,9 @@
 
 	/* Create pushbutton widget as Role category "none" button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->credits.prirole_none_btn = XmCreatePushButton(
 		m->credits.prirole_menu,
 		"creditsPrimaryRoleNoneButton",
@@ -4899,7 +5073,9 @@
 
 	/* Create pulldown menu widget for Sub-role selector */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->credits.subrole_menu = XmCreatePulldownMenu(
 		m->credits.form,
 		"creditsSubRolePulldownMenu",
@@ -4910,7 +5086,9 @@
 	/* Create option menu widget for Sub-role selector */
 	i = 0;
 	XtSetArg(arg[i], XmNsubMenuId, m->credits.subrole_menu); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
@@ -4941,7 +5119,9 @@
 
 	/* Create pushbutton widget as Sub-role "none" button */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->credits.subrole_none_btn = XmCreatePushButton(
 		m->credits.subrole_menu,
 		"creditsSubRoleNoneButton",
@@ -5162,7 +5342,9 @@
 	XtSetArg(arg[i], XmNselectionPolicy, XmBROWSE_SELECT); i++;
 	XtSetArg(arg[i], XmNlistSizePolicy, XmCONSTANT); i++;
 	XtSetArg(arg[i], XmNscrollBarDisplayPolicy, XmSTATIC); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNscrolledWindowMarginWidth, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->segments.seg_list = XmCreateScrolledList(
 		m->segments.form,
@@ -5708,7 +5890,9 @@
 	XtSetArg(arg[i], XmNselectionPolicy, XmBROWSE_SELECT); i++;
 	XtSetArg(arg[i], XmNlistSizePolicy, XmCONSTANT); i++;
 	XtSetArg(arg[i], XmNscrollBarDisplayPolicy, XmSTATIC); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNscrolledWindowMarginWidth, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->regionsel.region_list = XmCreateScrolledList(
 		m->regionsel.form,
@@ -5799,7 +5983,9 @@
 	XtSetArg(arg[i], XmNselectionPolicy, XmBROWSE_SELECT); i++;
 	XtSetArg(arg[i], XmNlistSizePolicy, XmCONSTANT); i++;
 	XtSetArg(arg[i], XmNscrollBarDisplayPolicy, XmSTATIC); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNscrolledWindowMarginWidth, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->matchsel.matchsel_list = XmCreateScrolledList(
 		m->matchsel.form,
@@ -6149,7 +6335,9 @@
 	/* Create toggle button for the allow mail button */
 	i = 0;
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->userreg.allowmail_btn = XmCreateToggleButton(
 		m->userreg.form,
@@ -6161,7 +6349,9 @@
 	/* Create toggle button for the allow stats button */
 	i = 0;
 	XtSetArg(arg[i], XmNalignment, XmALIGNMENT_BEGINNING); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 0); i++;
+#endif
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->userreg.allowstats_btn = XmCreateToggleButton(
 		m->userreg.form,
@@ -6280,7 +6470,9 @@
 
 	/* Create pulldown menu widget for topic selector */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->help.topic_menu = XmCreatePulldownMenu(
 		m->help.form,
 		"topicPulldownMenu",
@@ -6308,7 +6500,9 @@
 
 	/* Create pushbutton widget for online help menu entry */
 	i = 0;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	m->help.online_btn = XmCreatePushButton(
 		m->help.topic_menu,
 		"onlineHelpButton",
@@ -6319,7 +6513,9 @@
 	/* Create option menu widget for topic selector */
 	i = 0;
 	XtSetArg(arg[i], XmNsubMenuId, m->help.topic_menu); i++;
+#if ! defined(USE_SGI_DESKTOP)
 	XtSetArg(arg[i], XmNshadowThickness, 2); i++;
+#endif
 	XtSetArg(arg[i], XmNnavigationType, XmTAB_GROUP); i++;
 	XtSetArg(arg[i], XmNhelpCallback, help_cblist); i++;
 	m->help.topic_opt = XmCreateOptionMenu(
@@ -6780,6 +6976,11 @@
 STATIC void
 make_pixmaps(widgets_t *m, pixmaps_t *p, int depth)
 {
+	/* When compiling on SGI with 4Dwm window manager, use the capability
+	 * of 4Dwm to display a colorful iconified window (needs an external
+	 * SGI formatted image, called XMcd.icon, and placed in /usr/lib/images)
+	 */
+#if ! defined(USE_SGI_DESKTOP)
 	/* Set icon pixmap */
 	p->main.icon_pixmap = bm_to_px(
 		m->toplevel,
@@ -6790,6 +6991,7 @@
 		BM_PX_BWREV
 	);
 	XtVaSetValues(m->toplevel, XmNiconPixmap, p->main.icon_pixmap, NULL);
+#endif
 					
 	/*
 	 * The following puts proper pixmaps on button faces
@@ -7278,7 +7480,11 @@
 	);
 
 	p->dbprog.logo_pixmap = bm_to_px(
+#if defined(USE_SGI_DESKTOP)
+		m->main.level_scale,
+#else
 		m->main.dbprog_btn,
+#endif
 		logo_bits,
 		logo_width,
 		logo_height,
@@ -7293,7 +7499,11 @@
 	);
 
 	p->matchsel.logo_pixmap = bm_to_px(
+#if defined(USE_SGI_DESKTOP)
+		m->main.level_scale,
+#else
 		m->main.dtitle_ind,
+#endif
 		cddblogo_bits,
 		cddblogo_width,
 		cddblogo_height,
@@ -7308,7 +7518,11 @@
 	);
 
 	p->userreg.logo_pixmap = bm_to_px(
+#if defined(USE_SGI_DESKTOP)
+		m->main.level_scale,
+#else
 		m->main.dtitle_ind,
+#endif
 		cddblogo_bits,
 		cddblogo_width,
 		cddblogo_height,
@@ -7367,7 +7581,11 @@
 	);
 
 	p->submiturl.logo_pixmap = bm_to_px(
+#if defined(USE_SGI_DESKTOP)
+		m->main.level_scale,
+#else
 		m->main.dtitle_ind,
+#endif
 		cddblogo_bits,
 		cddblogo_width,
 		cddblogo_height,