← Back to branch summary

~ubuntu-branches/ubuntu/feisty/basilisk2/feisty

~ubuntu-branches/ubuntu/feisty/basilisk2/feisty

« back to all changes in this revision

Viewing changes to src/MacOSX/prefs_macosx.cpp

Committer: Bazaar Package Importer
Author(s): Jonas Smedegaard
Date: 2005-07-30 20:42:20 UTC
mfrom: (1.1.1 upstream)
Revision ID: james.westby@ubuntu.com-20050730204220-1nl1cg2jkjvy63ry

Tags: 0.9.20050730-1

* New upstream CVS snapshot.
* Build-depend on virtual libsdl-dev (not libsdl1.2-dev).
* Invoke init rules also on clean (to separate better from official
builds).
* Update URL of upstream source in debian/copyright.

files added:
ChangeLog.cvs

debian/cdbs/1

debian/cdbs/1/rules

debian/cdbs/1/rules/bts.mk

debian/cdbs/1/rules/buildinfo.mk

debian/control.in

debian/patches

debian/patches/01_mention_Macintosh_in_manpage.patch

src/MacOSX/BasiliskII.xcode

src/MacOSX/BasiliskII.xcode/project.pbxproj

src/MacOSX/Info.plist

src/MacOSX/clip_macosx.cpp

src/SDL

src/SDL/audio_sdl.cpp

src/SDL/keycodes

src/SDL/video_sdl.cpp

src/Unix/Darwin

src/Unix/Darwin/lowmem.c

src/Unix/Darwin/pagezero.c

src/Unix/Darwin/testlmem.sh

src/Unix/m4

src/Unix/m4/egrep.m4

src/Unix/m4/esd.m4

src/Unix/m4/gettext.m4

src/Unix/m4/gtk-2.0.m4

src/Unix/m4/gtk.m4

src/Unix/tunconfig

src/Windows

src/Windows/BasiliskII.ico

src/Windows/BasiliskII.rc

src/Windows/Makefile.in

src/Windows/b2ether

src/Windows/b2ether/inc

src/Windows/b2ether/inc/b2ether_hl.h

src/Windows/b2ether/inc/ntddpack.h

src/Windows/b2ether/multiopt.h

src/Windows/b2ether/packet32.cpp

src/Windows/cd_defs.h

src/Windows/cdenable

src/Windows/cdenable/cache.cpp

src/Windows/cdenable/cache.h

src/Windows/cdenable/cdenable.h

src/Windows/cdenable/eject_nt.cpp

src/Windows/cdenable/eject_nt.h

src/Windows/cdenable/ntcd.cpp

src/Windows/cdenable/ntcd.h

src/Windows/clip_windows.cpp

src/Windows/configure.ac

src/Windows/ether_windows.cpp

src/Windows/ether_windows.h

src/Windows/extfs_windows.cpp

src/Windows/kernel_windows.cpp

src/Windows/kernel_windows.h

src/Windows/main_windows.cpp

src/Windows/posix_emu.cpp

src/Windows/posix_emu.h

src/Windows/prefs_editor_gtk.cpp

src/Windows/prefs_windows.cpp

src/Windows/router

src/Windows/router/arp.cpp

src/Windows/router/arp.h

src/Windows/router/dump.cpp

src/Windows/router/dump.h

src/Windows/router/dynsockets.cpp

src/Windows/router/dynsockets.h

src/Windows/router/ftp.cpp

src/Windows/router/ftp.h

src/Windows/router/icmp.cpp

src/Windows/router/icmp.h

src/Windows/router/iphelp.cpp

src/Windows/router/iphelp.h

src/Windows/router/ipsocket.cpp

src/Windows/router/ipsocket.h

src/Windows/router/mib

src/Windows/router/mib/interfaces.cpp

src/Windows/router/mib/interfaces.h

src/Windows/router/mib/mibaccess.cpp

src/Windows/router/mib/mibaccess.h

src/Windows/router/router.cpp

src/Windows/router/router.h

src/Windows/router/router_types.h

src/Windows/router/tcp.cpp

src/Windows/router/tcp.h

src/Windows/router/udp.cpp

src/Windows/router/udp.h

src/Windows/serial_windows.cpp

src/Windows/sys_windows.cpp

src/Windows/sysdeps.h

src/Windows/timer_windows.cpp

src/Windows/user_strings_windows.cpp

src/Windows/user_strings_windows.h

src/Windows/util_windows.cpp

src/Windows/util_windows.h

src/Windows/xpram_windows.cpp

src/slirp

src/slirp/COPYRIGHT

src/slirp/bootp.c

src/slirp/bootp.h

src/slirp/cksum.c

src/slirp/ctl.h

src/slirp/debug.c

src/slirp/debug.h

src/slirp/icmp_var.h

src/slirp/if.c

src/slirp/if.h

src/slirp/ip.h

src/slirp/ip_icmp.c

src/slirp/ip_icmp.h

src/slirp/ip_input.c

src/slirp/ip_output.c

src/slirp/libslirp.h

src/slirp/main.h

src/slirp/mbuf.c

src/slirp/mbuf.h

src/slirp/misc.c

src/slirp/misc.h

src/slirp/sbuf.c

src/slirp/sbuf.h

src/slirp/slirp.c

src/slirp/slirp.h

src/slirp/slirp_config.h

src/slirp/socket.c

src/slirp/socket.h

src/slirp/tcp.h

src/slirp/tcp_input.c

src/slirp/tcp_output.c

src/slirp/tcp_subr.c

src/slirp/tcp_timer.c

src/slirp/tcp_timer.h

src/slirp/tcp_var.h

src/slirp/tcpip.h

src/slirp/tftp.c

src/slirp/tftp.h

src/slirp/udp.c

src/slirp/udp.h

src/uae_cpu/compiler/test_codegen_x86.cpp

files removed:
debian/cdbs/autotools-vars.mk

src/MacOSX/BasiliskII.pbproj/nigel.pbxuser

src/Unix/autom4te.cache

src/Unix/autom4te.cache/output.0

src/Unix/autom4te.cache/requests

src/Unix/autom4te.cache/traces.0

files modified:
BasiliskII.spec

ChangeLog

INSTALL

Makefile

README

TODO

debian/TODO

debian/changelog

debian/control

debian/copyright

debian/menu

debian/rules

debian/watch

src/AmigaOS/clip_amiga.cpp

src/AmigaOS/prefs_amiga.cpp

src/AmigaOS/sysdeps.h

src/AmigaOS/user_strings_amiga.cpp

src/AmigaOS/user_strings_amiga.h

src/AmigaOS/video_amiga.cpp

src/BeOS/about_window.cpp

src/BeOS/about_window.h

src/BeOS/audio_beos.cpp

src/BeOS/clip_beos.cpp

src/BeOS/ether_beos.cpp

src/BeOS/extfs_beos.cpp

src/BeOS/main_beos.cpp

src/BeOS/prefs_beos.cpp

src/BeOS/prefs_editor_beos.cpp

src/BeOS/scsi_beos.cpp

src/BeOS/serial_beos.cpp

src/BeOS/sys_beos.cpp

src/BeOS/sysdeps.h

src/BeOS/timer_beos.cpp

src/BeOS/user_strings_beos.cpp

src/BeOS/user_strings_beos.h

src/BeOS/video_beos.cpp

src/BeOS/xpram_beos.cpp

src/MacOSX/0_HOW_TO_BUILD.txt

src/MacOSX/1_prepare_files.sh

src/MacOSX/BasiliskII.pbproj/project.pbxproj

src/MacOSX/Controller.h

src/MacOSX/Controller.mm

src/MacOSX/Emulator.h

src/MacOSX/Emulator.mm

src/MacOSX/EmulatorView.h

src/MacOSX/EmulatorView.mm

src/MacOSX/English.lproj/InfoPlist.strings

src/MacOSX/English.lproj/MainMenu.nib/classes.nib

src/MacOSX/English.lproj/MainMenu.nib/info.nib

src/MacOSX/English.lproj/MainMenu.nib/objects.nib

src/MacOSX/HowTo.html

src/MacOSX/Makefile.in

src/MacOSX/NNThread.h

src/MacOSX/NNThread.m

src/MacOSX/PrefsEditor.h

src/MacOSX/PrefsEditor.mm

src/MacOSX/ToDo.html

src/MacOSX/Versions.html

src/MacOSX/audio_defs_macosx.h

src/MacOSX/audio_macosx.cpp

src/MacOSX/audio_macosx.mm

src/MacOSX/configure.in

src/MacOSX/extfs_macosx.h

src/MacOSX/extfs_macosx.mm

src/MacOSX/macos_util_macosx.h

src/MacOSX/main_macosx.h

src/MacOSX/main_macosx.mm

src/MacOSX/misc_macosx.h

src/MacOSX/misc_macosx.mm

src/MacOSX/prefs_macosx.cpp

src/MacOSX/sys_darwin.cpp

src/MacOSX/sysdeps.h

src/MacOSX/video_macosx.h

src/MacOSX/video_macosx.mm

src/Unix/BasiliskII.1

src/Unix/FreeBSD/scsi_freebsd.cpp

src/Unix/FreeBSD/scsidump.cpp

src/Unix/Irix/audio_irix.cpp

src/Unix/Irix/unaligned.c

src/Unix/Linux/NetDriver/Makefile

src/Unix/Linux/NetDriver/sheep_net.c

src/Unix/Linux/scsi_linux.cpp

src/Unix/Makefile.in

src/Unix/Solaris/audio_solaris.cpp

src/Unix/acinclude.m4

src/Unix/aclocal.m4

src/Unix/asm_support.s

src/Unix/audio_oss_esd.cpp

src/Unix/clip_unix.cpp

src/Unix/config.h.in

src/Unix/configure

src/Unix/configure.ac

src/Unix/ether_unix.cpp

src/Unix/extfs_unix.cpp

src/Unix/keycodes

src/Unix/main_unix.cpp

src/Unix/posix_sem.cpp

src/Unix/prefs_editor_gtk.cpp

src/Unix/prefs_unix.cpp

src/Unix/semaphore.h

src/Unix/serial_unix.cpp

src/Unix/sigsegv.cpp

src/Unix/sigsegv.h

src/Unix/sys_unix.cpp

src/Unix/sysdeps.h

src/Unix/timer_unix.cpp

src/Unix/user_strings_unix.cpp

src/Unix/user_strings_unix.h

src/Unix/video_blit.cpp

src/Unix/video_blit.h

src/Unix/video_vosf.h

src/Unix/video_x.cpp

src/Unix/vm_alloc.cpp

src/Unix/vm_alloc.h

src/Unix/xpram_unix.cpp

src/adb.cpp

src/audio.cpp

src/cdrom.cpp

src/disk.cpp

src/dummy/audio_dummy.cpp

src/dummy/clip_dummy.cpp

src/dummy/ether_dummy.cpp

src/dummy/prefs_dummy.cpp

src/dummy/prefs_editor_dummy.cpp

src/dummy/scsi_dummy.cpp

src/dummy/serial_dummy.cpp

src/dummy/user_strings_dummy.cpp

src/dummy/xpram_dummy.cpp

src/emul_op.cpp

src/ether.cpp

src/extfs.cpp

src/include/adb.h

src/include/audio.h

src/include/audio_defs.h

src/include/cdrom.h

src/include/clip.h

src/include/debug.h

src/include/disk.h

src/include/emul_op.h

src/include/ether.h

src/include/ether_defs.h

src/include/extfs.h

src/include/extfs_defs.h

src/include/macos_util.h

src/include/main.h

src/include/prefs.h

src/include/prefs_editor.h

src/include/rom_patches.h

src/include/rsrc_patches.h

src/include/scsi.h

src/include/serial.h

src/include/serial_defs.h

src/include/slot_rom.h

src/include/sony.h

src/include/sys.h

src/include/timer.h

src/include/user_strings.h

src/include/version.h

src/include/video.h

src/include/video_defs.h

src/include/xpram.h

src/macos_util.cpp

src/main.cpp

src/native_cpu/cpu_emulation.h

src/powerrom_cpu/cpu_emulation.h

src/powerrom_cpu/powerrom_cpu.cpp

src/prefs.cpp

src/prefs_items.cpp

src/rom_patches.cpp

src/rsrc_patches.cpp

src/scsi.cpp

src/serial.cpp

src/slot_rom.cpp

src/sony.cpp

src/timer.cpp

src/uae_cpu/basilisk_glue.cpp

src/uae_cpu/build68k.c

src/uae_cpu/compiler/codegen_x86.cpp

src/uae_cpu/compiler/codegen_x86.h

src/uae_cpu/compiler/compemu.h

src/uae_cpu/compiler/compemu_fpp.cpp

src/uae_cpu/compiler/compemu_support.cpp

src/uae_cpu/compiler/flags_x86.h

src/uae_cpu/compiler/gencomp.c

src/uae_cpu/cpu_emulation.h

src/uae_cpu/fpu/core.h

src/uae_cpu/fpu/exceptions.cpp

src/uae_cpu/fpu/exceptions.h

src/uae_cpu/fpu/flags.cpp

src/uae_cpu/fpu/flags.h

src/uae_cpu/fpu/fpu.h

src/uae_cpu/fpu/fpu_ieee.h

src/uae_cpu/fpu/fpu_uae.h

src/uae_cpu/fpu/fpu_x86.cpp

src/uae_cpu/fpu/fpu_x86.h

src/uae_cpu/fpu/impl.h

src/uae_cpu/fpu/mathlib.cpp

src/uae_cpu/fpu/mathlib.h

src/uae_cpu/fpu/rounding.cpp

src/uae_cpu/fpu/rounding.h

src/uae_cpu/fpu/types.h

src/uae_cpu/gencpu.c

src/uae_cpu/memory.cpp

src/uae_cpu/memory.h

src/uae_cpu/newcpu.cpp

src/uae_cpu/newcpu.h

src/uae_cpu/readcpu.cpp

src/uae_cpu/spcflags.h

src/user_strings.cpp

src/video.cpp

src/xpram.cpp

Show diffs side-by-side

added added

removed removed

src/MacOSX/prefs_macosx.cpp

1

1

/*

2

* $Id: prefs_macosx.cpp,v 1.3 2003/04/02 02:15:52 nigel Exp $

2

* $Id: prefs_macosx.cpp,v 1.9 2005/01/30 21:42:13 gbeauche Exp $

3

3

*

4

* prefs_macosx.cpp - Preferences handling, Unix specific.

4

* prefs_macosx.cpp - Preferences handling, Mac OS X specific.

5

5

* Based on prefs_unix.cpp

6

6

*

7

* Basilisk II (C) 1997-2002 Christian Bauer

7

* Basilisk II (C) 1997-2005 Christian Bauer

8

8

*

9

9

* This program is free software; you can redistribute it and/or modify

10

10

* it under the terms of the GNU General Public License as published by

76

76

// No prefs file, save defaults

77

77

SavePrefs();

78

78

}

79

80

// Remove Nigel's bad old serial prefs

81

82

const char *str;

83

int tmp = 0;

84

85

if ( (str = PrefsFindString("seriala") ) != NULL

86

&& strcmp(str, "/dev/ttys0") == 0 )

87

{

88

puts("Deleting invalid prefs item 'seriala /dev/ttys0'");

89

PrefsRemoveItem("seriala", 1);

90

}

91

92

if ( (str = PrefsFindString("serialb") ) != NULL

93

&& strcmp(str, "/dev/ttys1") == 0 )

94

{

95

puts("Deleting invalid prefs item 'serialb /dev/ttys1'");

96

PrefsRemoveItem("serialb", 1);

97

}

98

99

// Floppy & cdrom prefs are always removed -

100

// we search for them each time the emulator is started

101

102

while ( (str = PrefsFindString("floppy", tmp) ) != NULL )

103

PrefsRemoveItem("floppy", tmp);

104

105

while ( (str = PrefsFindString("cdrom", tmp) ) != NULL )

106

PrefsRemoveItem("cdrom", tmp);

79

107

}

80

108

81

109

100

128

101

129

void AddPlatformPrefsDefaults(void)

102

130

{

103

PrefsReplaceString("extfs", "/");

131

PrefsReplaceString("extfs", getenv("HOME"));

104

132

PrefsReplaceString("screen", "win/512/384/16");

105

133

#ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION

106

134

PrefsAddBool("ignoresegv", false);

Older »