|
From: <st...@us...> - 2008-05-25 18:59:05
|
Revision: 18808
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18808&view=rev
Author: strik
Date: 2008-05-25 11:59:05 -0700 (Sun, 25 May 2008)
Log Message:
-----------
2008-05-25 Christian Vogelgsang <ch...@vo...>
* configure.in: honor OBJCFLAGS if available. added Carbon lib
for Cocoa linking.
* build/Makefile.am, build/macosx/build-vice-release.sh: added
build-vice-release script
* Makefile.am: make bindist on Macs need the bash
* data/C64/Makefile.am, data/C64/osx_sym_de.vkm,
data/C64/osx_pos.vkm, data/C64/osx_sym_us.vkm: fixed Cocoa key
maps
* src/arch/unix/archdep.[ch]: made archdep_pref_path const.
* src/arch/unix/macosx/make-bindist.sh,
src/arch/unix/macosx/Info.plist: added crt file format. use new
icons for Cocoa port.
* src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj: added
VICE XCode project to manage nib files more easily
* src/arch/unix/macosx/cocoa/main.m: store preferences in
~/Library/Preferences/org.viceteam.<emu> now
* src/arch/unix/macosx/cocoa/uimon.m,
src/arch/unix/macosx/cocoa/console.m,
src/arch/unix/macosx/cocoa/menu/c64machinecontroller.m:
deprecated NSString calls removed
* src/arch/unix/macosx/cocoa/kbd.h: added cocoa sym_de keymap
* src/arch/unix/macosx/cocoa/videoarch.h,
src/arch/unix/macosx/cocoa/viceapplication.h,
src/arch/unix/macosx/cocoa/vicemachine.h,
src/arch/unix/macosx/cocoa/video.m,
src/arch/unix/macosx/cocoa/vicemachine.m: added canvasId to
manage canvas ptr on App side
* src/arch/unix/macosx/cocoa/kbd.m: added missing include
* src/arch/unix/macosx/cocoa/fullscreen.m: removed obsolete
function
* src/arch/unix/macosx/cocoa/view/joystickview.m,
src/arch/unix/macosx/cocoa/view/keypressview.m: removed compile
warning
* src/arch/unix/macosx/cocoa/view/consolewindow.m: fixed output
bug
* src/arch/unix/macosx/cocoa/view/viceglview.[hm]: added auto
hide mouse and menu
* src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.[hm]:
added resource methods
* src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.[hm]:
rewrote drive settings UI
* src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.[hm],
src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.[hm]:
added resource editor
* src/arch/unix/macosx/cocoa/dialog/printersettingswindowcontroller.[hm]:
added printer settings UI
* src/arch/unix/macosx/cocoa/dialog/soundsettingswindowcontroller.[hm]:
added sound settings UI
* src/arch/unix/macosx/cocoa/dialog/iecdrivesettingswindowcontroller.[hm]:
added IEC drive settings UI
* src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.[hm]:
added record media UI
* src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.[hm]:
added keyboard settings UI
* src/arch/unix/macosx/cocoa/menu/viceappcontroller.[hm],
src/arch/unix/macosx/cocoa/menu/c64controller.[hm]: added new UI
dialogs
* src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.[hm]:
added machine control functions for new UI features
* src/arch/unix/macosx/Resources/English.lproj/*: added nib
files for new UI
* src/arch/unix/macosx/Makefile.am,
src/arch/unix/macosx/Resources/Makefile.am,
src/arch/unix/macosx/cocoa/dialog/Makefile.am: added new files
Modified Paths:
--------------
trunk/vice/ChangeLog
trunk/vice/Makefile.am
trunk/vice/build/Makefile.am
trunk/vice/configure.in
trunk/vice/data/C64/Makefile.am
trunk/vice/data/C64/osx_pos.vkm
trunk/vice/src/ChangeLog
trunk/vice/src/arch/unix/archdep.c
trunk/vice/src/arch/unix/archdep.h
trunk/vice/src/arch/unix/macosx/Info.plist
trunk/vice/src/arch/unix/macosx/Makefile.am
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/Makefile.am
trunk/vice/src/arch/unix/macosx/cocoa/console.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.am
trunk/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/fullscreen.m
trunk/vice/src/arch/unix/macosx/cocoa/kbd.h
trunk/vice/src/arch/unix/macosx/cocoa/kbd.m
trunk/vice/src/arch/unix/macosx/cocoa/main.m
trunk/vice/src/arch/unix/macosx/cocoa/menu/c64controller.h
trunk/vice/src/arch/unix/macosx/cocoa/menu/c64controller.m
trunk/vice/src/arch/unix/macosx/cocoa/menu/c64machinecontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/uimon.m
trunk/vice/src/arch/unix/macosx/cocoa/viceapplication.h
trunk/vice/src/arch/unix/macosx/cocoa/viceapplication.m
trunk/vice/src/arch/unix/macosx/cocoa/vicemachine.h
trunk/vice/src/arch/unix/macosx/cocoa/vicemachine.m
trunk/vice/src/arch/unix/macosx/cocoa/video.m
trunk/vice/src/arch/unix/macosx/cocoa/videoarch.h
trunk/vice/src/arch/unix/macosx/cocoa/view/consolewindow.m
trunk/vice/src/arch/unix/macosx/cocoa/view/fullscreenwindow.m
trunk/vice/src/arch/unix/macosx/cocoa/view/joystickview.m
trunk/vice/src/arch/unix/macosx/cocoa/view/keypressview.m
trunk/vice/src/arch/unix/macosx/cocoa/view/viceglview.h
trunk/vice/src/arch/unix/macosx/cocoa/view/viceglview.m
trunk/vice/src/arch/unix/macosx/cocoa/view/vicewindow.m
trunk/vice/src/arch/unix/macosx/make-bindist.sh
Added Paths:
-----------
trunk/vice/build/macosx/build-vice-release.sh
trunk/vice/data/C64/osx_sym_de.vkm
trunk/vice/data/C64/osx_sym_us.vkm
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceTree.plist
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/VICE.icns
trunk/vice/src/arch/unix/macosx/Resources/cartridge.icns
trunk/vice/src/arch/unix/macosx/Resources/floppy525.icns
trunk/vice/src/arch/unix/macosx/Resources/tape.icns
trunk/vice/src/arch/unix/macosx/Resources/x128.icns
trunk/vice/src/arch/unix/macosx/Resources/x64.icns
trunk/vice/src/arch/unix/macosx/Resources/x65.icns
trunk/vice/src/arch/unix/macosx/Resources/xcbm2.icns
trunk/vice/src/arch/unix/macosx/Resources/xpet.icns
trunk/vice/src/arch/unix/macosx/Resources/xplus4.icns
trunk/vice/src/arch/unix/macosx/Resources/xvic.icns
trunk/vice/src/arch/unix/macosx/VICE.xcodeproj/
trunk/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj
trunk/vice/src/arch/unix/macosx/cocoa/dialog/iecdrivesettingswindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/iecdrivesettingswindowcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/printersettingswindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/printersettingswindowcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/soundsettingswindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/soundsettingswindowcontroller.m
Removed Paths:
-------------
trunk/vice/data/C64/osx_sym.vkm
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj
Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/ChangeLog 2008-05-25 18:59:05 UTC (rev 18808)
@@ -1,3 +1,17 @@
+2008-05-25 Christian Vogelgsang <ch...@vo...>
+
+ * configure.in: honor OBJCFLAGS if available. added Carbon lib
+ for Cocoa linking.
+
+ * build/Makefile.am, build/macosx/build-vice-release.sh: added
+ build-vice-release script
+
+ * Makefile.am: make bindist on Macs need the bash
+
+ * data/C64/Makefile.am, data/C64/osx_sym_de.vkm,
+ data/C64/osx_pos.vkm, data/C64/osx_sym_us.vkm: fixed Cocoa key
+ maps
+
2008-05-19 Spiro Trikaliotis <spi...@gm...>
* autogen.sh: Removed "bash-ism" from script (compare with "=="
Modified: trunk/vice/Makefile.am
===================================================================
--- trunk/vice/Makefile.am 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/Makefile.am 2008-05-25 18:59:05 UTC (rev 18808)
@@ -60,10 +60,10 @@
if UNIX_MACOSX_COMPILE
bindist:
- $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@
+ /bin/bash @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@
bindistzip:
- $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@
+ /bin/bash @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@
endif
if UNIX_SKYOS_COMPILE
Modified: trunk/vice/build/Makefile.am
===================================================================
--- trunk/vice/build/Makefile.am 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/build/Makefile.am 2008-05-25 18:59:05 UTC (rev 18808)
@@ -11,6 +11,7 @@
macosx/build-readline.sh \
macosx/build-vice-dist.sh \
macosx/build-ffmpeglame.sh \
+ macosx/build-vice-release.sh \
minix3/build.sh \
minix3/build-package.sh \
qnx4/build.sh \
Copied: trunk/vice/build/macosx/build-vice-release.sh (from rev 18806, tags/chris/v1.22.15-cocoa-port/build/macosx/build-vice-release.sh)
===================================================================
--- trunk/vice/build/macosx/build-vice-release.sh (rev 0)
+++ trunk/vice/build/macosx/build-vice-release.sh 2008-05-25 18:59:05 UTC (rev 18808)
@@ -0,0 +1,153 @@
+#!/bin/bash
+#
+# build snapshot binaries for x11 gtk and cocoa from the SVN
+#
+# written by Christian Vogelgsang <ch...@vo...>
+#
+# Usage:
+# build-vice-release [-s] [<vice-svn-repository>] [<path to extlib>] [<target dir>] [<arch>] [<uis>]
+# -s = snapshot
+
+echo "--- build VICE release from SVN repository ---"
+
+# is a snapshot
+SNAPSHOT=0
+if [ "x$1" = "x-s" ]; then
+ SNAPSHOT=1
+ shift
+fi
+
+# check repository directory
+SVN_REPO="$1"
+if [ "x$SVN_REPO" = x ]; then
+ SVN_REPO=vice-emu-cocoa
+fi
+if [ ! -d "$SVN_REPO" ]; then
+ echo "ERROR: SVN repository '$SVN_REPO' not found!"
+ exit 1
+fi
+SVN_REPO="`(cd \"$SVN_REPO\" && pwd -P)`"
+echo "SVN repository: $SVN_REPO"
+
+# check extlib directory
+EXTLIB="$2"
+if [ "x$EXTLIB" = x ]; then
+ EXTLIB=extlib
+fi
+if [ ! -d "$EXTLIB" ]; then
+ echo "ERROR: external libs '$EXTLIB' not found!"
+ exit 1
+fi
+EXTLIB="`(cd \"$EXTLIB\" && pwd)`"
+echo "external libs: $EXTLIB"
+
+# check target dir
+BUILD_DIR="$3"
+if [ "x$BUILD_DIR" = x ]; then
+ if [ $SNAPSHOT = 1 ]; then
+ BUILD_DIR=build-vice-snapshot
+ else
+ BUILD_DIR=build-vice-release
+ fi
+fi
+if [ -d "$BUILD_DIR" ]; then
+ echo "ERROR: $BUILD_DIR already exists!"
+ exit 1
+fi
+BUILD_DIR="`pwd`/$BUILD_DIR"
+echo "build dir: $BUILD_DIR"
+
+# get revision of build
+REVISION=`(cd "$SVN_REPO" && svn info | grep Revision | awk '{ print $2 }')`
+echo "SVN revision: $REVISION"
+
+# create build src dir
+echo "creating dir $BUILD_DIR"
+mkdir -p "$BUILD_DIR"
+if [ ! -d "$BUILD_DIR" ]; then
+ echo "ERROR: can't creat dir!"
+ exit 1
+fi
+
+# export fresh source
+SRC_DIR="$BUILD_DIR/src"
+echo "exporting src $SRC_DIR"
+svn export "$SVN_REPO" "$SRC_DIR"
+if [ $? != 0 ]; then
+ echo "ERROR: export faild!"
+ exit 1
+fi
+
+# patch BUILD version if doing snapshot
+if [ $SNAPSHOT = 1 ]; then
+ # tag
+ DATE=`date '+%Y%m%d'`
+ TAG="-r${REVISION}_$DATE"
+
+ # patch VICE_VERSION_BUILD
+ echo "patching configure.in: $TAG"
+ PATCH_VVB="$SRC_DIR/configure.in"
+ perl -pi -e "s/(VICE_VERSION_BUILD=\d+).*\$/\$1$TAG/" $PATCH_VVB
+ if [ $? != 0 ]; then
+ echo "ERROR: patching..."
+ exit 1
+ fi
+fi
+
+# configure snapshot
+echo "configuring new source tree"
+(cd "$SRC_DIR/src/resid" && aclocal && automake && autoconf) >/dev/null 2>&1
+if [ $? != 0 ]; then
+ echo "ERROR: configuring resid..."
+ exit 1
+fi
+(cd "$SRC_DIR" && aclocal && autoheader && automake --add-missing && autoconf) >/dev/null 2>&1
+if [ $? != 0 ]; then
+ echo "ERROR: configuring VICE..."
+ exit 1
+fi
+
+# build dists
+ARCH="$4"
+if [ "x$ARCH" = "x" ]; then
+ ARCH="ub"
+fi
+UI="$5"
+if [ "x$UI" = "x" ]; then
+ UI="x11 gtk cocoa"
+fi
+if [ "$UI" != "none" ]; then
+ echo "--- binaries for $UI ---"
+ for dist in $UI ; do
+ echo "building binaries for $dist/$ARCH"
+ LOG="$BUILD_DIR/build-$dist.log"
+ (cd "$SRC_DIR" && $BASH build/macosx/build-vice-dist.sh $ARCH $dist dmg "$EXTLIB" "$BUILD_DIR") >"$LOG" 2>&1
+ FILES="$(ls $BUILD_DIR/$dist/$ARCH/*.dmg 2>/dev/null)"
+ echo "generated files: $FILES"
+ if [ "x$FILES" = "x" ]; then
+ echo "no file found!"
+ exit 1
+ fi
+ grep +++ "$LOG"
+ du -sh "$FILES"
+ mv "$FILES" "$BUILD_DIR"
+ done
+fi
+
+# packing source
+echo "--- source ---"
+echo "packing source"
+DEST_DIR="$BUILD_DIR/tarball"
+mkdir "$DEST_DIR"
+if [ ! -d "$DEST_DIR" ]; then
+ echo "ERROR: creating dir"
+ exit 1
+fi
+(cd "$DEST_DIR" && $SRC_DIR/configure && make dist) >/dev/null 2>&1
+FILES="$(ls $DEST_DIR/*.tar.gz 2>/dev/null)"
+echo "generated: $FILES"
+du -sh "$FILES"
+mv "$FILES" "$BUILD_DIR"
+
+echo "--- ready ---"
+exit 0
Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/configure.in 2008-05-25 18:59:05 UTC (rev 18808)
@@ -102,7 +102,9 @@
dnl --- setup Objective-C ---
OBJC="${CC}"
-OBJCFLAGS="${CFLAGS}"
+if [ "x${OBJCFLAGS}" = x ]; then
+ OBJCFLAGS="${CFLAGS}"
+fi
OBJCDEPMODE="depmode=${CC}"
AC_SUBST(OBJC)
AC_SUBST(OBJCFLAGS)
@@ -1834,7 +1836,7 @@
ARCH_LIBS="$ARCH_DIR/macosx/cocoa/menu/libarchmacosxcocoamenu.a $ARCH_DIR/macosx/cocoa/dialog/libarchmacosxcocoadialog.a $ARCH_DIR/macosx/cocoa/libarchmacosxcocoa.a $ARCH_DIR/macosx/cocoa/view/libarchmacosxcocoaview.a $ARCH_DIR/macosx/libarchmacosx.a $ARCH_DIR/libarch.a $ARCH_LIBS"
ARCH_INCLUDES="-I$ARCH_SRC_DIR/macosx/cocoa/menu -I$ARCH_SRC_DIR/macosx/cocoa/dialog -I$ARCH_SRC_DIR/macosx/cocoa/view -I$ARCH_SRC_DIR/macosx/cocoa -I$ARCH_SRC_DIR $ARCH_INCLUDES"
ARCH_EXTRA_SUBDIR="macosx macosx/cocoa macosx/cocoa/view macosx/cocoa/menu macosx/cocoa/dialog"
- UI_LIBS="-framework Cocoa -framework OpenGL"
+ UI_LIBS="-framework Cocoa -framework OpenGL -framework Carbon"
UNIX_MACOSX_UITYPE=cocoa
else
ARCH_LIBS="$ARCH_DIR/macosx/libarchmacosx.a $ARCH_LIBS"
Modified: trunk/vice/data/C64/Makefile.am
===================================================================
--- trunk/vice/data/C64/Makefile.am 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/data/C64/Makefile.am 2008-05-25 18:59:05 UTC (rev 18808)
@@ -21,7 +21,8 @@
os2.vkm \
os2_sym.vkm \
osx_pos.vkm \
- osx_sym.vkm \
+ osx_sym_de.vkm \
+ osx_sym_us.vkm \
pc64.vpl \
ROdflt.vkm \
vice.vpl \
Modified: trunk/vice/data/C64/osx_pos.vkm
===================================================================
--- trunk/vice/data/C64/osx_pos.vkm 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/data/C64/osx_pos.vkm 2008-05-25 18:59:05 UTC (rev 18808)
@@ -21,15 +21,8 @@
# 2 left shift
# 4 right shift
# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
!CLEAR
!LSHIFT 1 7
@@ -42,7 +35,7 @@
3 2 5 8 /* F -> F */
4 3 5 8 /* H -> H */
5 3 2 8 /* G -> G */
-6 3 1 8 /* Y -> Y */
+6 1 4 8 /* Y -> Z */
7 2 7 8 /* X -> X */
8 2 4 8 /* C -> C */
9 3 7 8 /* V -> V */
@@ -52,7 +45,8 @@
13 1 1 8 /* W -> W */
14 1 6 8 /* E -> E */
15 2 1 8 /* R -> R */
-16 1 4 8 /* Z -> Z */
+
+16 3 1 8 /* Z -> Y */
17 2 6 8 /* T -> T */
18 7 0 8 /* 1 -> 1 */
19 7 3 8 /* 2 -> 2 */
@@ -68,6 +62,7 @@
29 4 3 8 /* 0 -> 0 */
30 6 1 8 /* Plus -> * */
31 4 6 8 /* O -> O */
+
32 3 6 8 /* U -> U */
33 5 6 8 /* "U -> @ */
34 4 1 8 /* I -> I */
@@ -84,23 +79,24 @@
45 4 7 8 /* N -> N */
46 4 4 8 /* M -> M */
47 5 4 8 /* . -> . */
+
48 7 2 8 /* TAB -> Ctrl */
49 7 4 8 /* Space -> Space */
-#50 -1 -1 0 /* <> -> (no key) */
+50 7 5 8 /* < > -> CBM */
51 0 0 8 /* Backspace -> Del */
52 6 4 4 /* Enter -> Right Shift */
53 7 7 8 /* ESC -> Run/Stop */
-
-#54 -1 -1 0 /* (no key) */
-#55 -1 -1 0 /* (no key) */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
56 1 7 2 /* Left Shift -> Left Shift */
#57 -1 -1 0 /* (no key) */
-58 7 5 8 /* Option -> CBM */
+58 7 5 8 /* Left Alt -> CBM */
59 7 2 8 /* Left Ctrl -> CBM */
-#60 -1 -1 0 /* (no key) */
-#61 -1 -1 0 /* (no key) */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
#62 -1 -1 0 /* (no key) */
-#63 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
#64 -1 -1 0 /* (no key) */
#65 -1 -1 0 /* Numpad . -> (no key) */
#66 -1 -1 0 /* &&& -> (no key) */
@@ -116,6 +112,7 @@
#76 -1 -1 0 /* Numpad Enter -> (no key) */
#77 -1 -1 0 /* &&& -> (no key) */
#78 -1 -1 0 /* Numpad - -> (no key) */
+
#82 -1 -1 0 /* Numpad 0 -> (no key) */
#83 -1 -1 0 /* Numpad 1 -> (no key) */
#84 -1 -1 0 /* Numpad 2 -> (no key) */
@@ -126,53 +123,25 @@
#89 -1 -1 0 /* Numpad 7 -> (no key) */
#91 -1 -1 0 /* Numpad 8 -> (no key) */
#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
96 0 6 8 /* F5 -> F5 */
97 0 6 1 /* F6 -> F6 */
98 0 3 8 /* F7 -> F7 */
99 0 5 8 /* F3 -> F3 */
100 0 3 1 /* F8 -> F8 */
-#101 -1 -1 0 /* F9 -> (no key) */
-#103 -1 -1 0 /* F11 -> (no key) */
-#109 -1 -1 0 /* F10 -> (no key) */
-#111 -1 -1 0 /* F12 -> (no key) */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
115 6 3 8 /* Home -> CLR/HOME */
116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
118 0 5 1 /* F4 -> F4 */
120 0 4 1 /* F2 -> F2 */
121 6 0 8 /* PgDown -> Pound */
122 0 4 8 /* F1 -> F1 */
123 0 2 1 /* Left -> CRSR LEFT */
-124 0 2 8 /* Right -> CRSR RIGHT */
-125 0 7 8 /* Down -> CRSR DOWN */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
126 0 7 1 /* Up -> CRSR UP */
-
-#
-# Joystick 1
-#
-#KP_0 -1 0
-#KP_1 -1 1
-#KP_2 -1 2
-#KP_3 -1 3
-#KP_4 -1 4
-#KP_5 -1 5
-#KP_6 -1 6
-#KP_7 -1 7
-#KP_8 -1 8
-#KP_9 -1 9
-
-#
-# Joystick 2
-#
-#w -2 7
-#e -2 8
-#r -2 9
-#s -2 4
-#d -2 5
-#f -2 6
-#x -2 1
-#c -2 2
-#v -2 3
-#space -2 0
-
-# Restore key mappings
-117 -3 0 /* Del -> RESTORE */
Deleted: trunk/vice/data/C64/osx_sym.vkm
===================================================================
--- trunk/vice/data/C64/osx_sym.vkm 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/data/C64/osx_sym.vkm 2008-05-25 18:59:05 UTC (rev 18808)
@@ -1,183 +0,0 @@
-# VICE keyboard mapping file
-#
-# A Keyboard map is read in as patch to the current map.
-#
-# File format:
-# - comment lines start with '#'
-# - keyword lines start with '!keyword'
-# - normal line has 'keysym/scancode row column shiftflag'
-#
-# Keywords and their lines are:
-# '!CLEAR' clear whole table
-# '!INCLUDE filename' read file as mapping file
-# '!LSHIFT row col' left shift keyboard row/column
-# '!RSHIFT row col' right shift keyboard row/column
-# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
-# '!UNDEF keysym' remove keysym from table
-#
-# Shiftflag can have the values:
-# 0 key is not shifted for this keysym
-# 1 key is shifted for this keysym
-# 2 left shift
-# 4 right shift
-# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
-
-!CLEAR
-!LSHIFT 1 7
-!RSHIFT 6 4
-!VSHIFT RSHIFT
-
-0 1 2 8 /* A -> A */
-1 1 5 8 /* S -> S */
-2 2 2 8 /* D -> D */
-3 2 5 8 /* F -> F */
-4 3 5 8 /* H -> H */
-5 3 2 8 /* G -> G */
-6 3 1 8 /* Y -> Y */
-7 2 7 8 /* X -> X */
-8 2 4 8 /* C -> C */
-9 3 7 8 /* V -> V */
-10 7 1 8 /* ^ -> Left Arrow */
-11 3 4 8 /* B -> B */
-12 7 6 8 /* Q -> Q */
-13 1 1 8 /* W -> W */
-14 1 6 8 /* E -> E */
-15 2 1 8 /* R -> R */
-16 1 4 8 /* Z -> Z */
-17 2 6 8 /* T -> T */
-18 7 0 8 /* 1 -> 1 */
-19 7 3 8 /* 2 -> 2 */
-20 1 0 8 /* 3 -> 3 */
-21 1 3 8 /* 4 -> 4 */
-22 2 3 8 /* 6 -> 6 */
-23 2 0 8 /* 5 -> 5 */
-24 5 3 8 /* ` -> Minus */
-25 4 0 8 /* 9 -> 9 */
-26 3 0 8 /* 7 -> 7 */
-27 5 0 8 /* \ss -> Plus */
-28 3 3 8 /* 8 -> 8 */
-29 4 3 8 /* 0 -> 0 */
-30 6 1 8 /* Plus -> * */
-31 4 6 8 /* O -> O */
-32 3 6 8 /* U -> U */
-33 5 6 8 /* "U -> @ */
-34 4 1 8 /* I -> I */
-35 5 1 8 /* P -> P */
-36 0 1 8 /* Return -> Return */
-37 5 2 8 /* L -> L */
-38 4 2 8 /* J -> J */
-39 6 2 8 /* "A -> ; */
-40 4 5 8 /* K -> K */
-41 5 5 8 /* "O -> : */
-42 6 5 8 /* Hash -> = */
-43 5 7 8 /* , -> , */
-44 6 7 8 /* Minus -> / */
-45 4 7 8 /* N -> N */
-46 4 4 8 /* M -> M */
-47 5 4 8 /* . -> . */
-48 7 2 8 /* TAB -> Ctrl */
-49 7 4 8 /* Space -> Space */
-#50 -1 -1 0 /* <> -> (no key) */
-51 0 0 8 /* Backspace -> Del */
-52 6 4 4 /* Enter -> Right Shift */
-53 7 7 8 /* ESC -> Run/Stop */
-
-#54 -1 -1 0 /* (no key) */
-#55 -1 -1 0 /* (no key) */
-56 1 7 2 /* Left Shift -> Left Shift */
-#57 -1 -1 0 /* (no key) */
-58 7 5 8 /* Option -> CBM */
-59 7 2 8 /* Left Ctrl -> CBM */
-#60 -1 -1 0 /* (no key) */
-#61 -1 -1 0 /* (no key) */
-#62 -1 -1 0 /* (no key) */
-#63 -1 -1 0 /* (no key) */
-#64 -1 -1 0 /* (no key) */
-#65 -1 -1 0 /* Numpad . -> (no key) */
-#66 -1 -1 0 /* &&& -> (no key) */
-#67 -1 -1 0 /* Numpad * -> (no key) */
-#68 -1 -1 0 /* (no key) */
-#69 -1 -1 0 /* Numpad + -> (no key) */
-#70 -1 -1 0 /* &&& -> (no key) */
-#71 -1 -1 0 /* Numpad Clear -> (no key) */
-#72 -1 -1 0 /* &&& -> (no key) */
-#73 -1 -1 0 /* &&& -> (no key) */
-#74 -1 -1 0 /* &&& -> (no key) */
-#75 -1 -1 0 /* Numpad / -> (no key) */
-#76 -1 -1 0 /* Numpad Enter -> (no key) */
-#77 -1 -1 0 /* &&& -> (no key) */
-#78 -1 -1 0 /* Numpad - -> (no key) */
-#82 -1 -1 0 /* Numpad 0 -> (no key) */
-#83 -1 -1 0 /* Numpad 1 -> (no key) */
-#84 -1 -1 0 /* Numpad 2 -> (no key) */
-#85 -1 -1 0 /* Numpad 3 -> (no key) */
-#86 -1 -1 0 /* Numpad 4 -> (no key) */
-#87 -1 -1 0 /* Numpad 5 -> (no key) */
-#88 -1 -1 0 /* Numpad 6 -> (no key) */
-#89 -1 -1 0 /* Numpad 7 -> (no key) */
-#91 -1 -1 0 /* Numpad 8 -> (no key) */
-#92 -1 -1 0 /* Numpad 9 -> (no key) */
-96 0 6 8 /* F5 -> F5 */
-97 0 6 1 /* F6 -> F6 */
-98 0 3 8 /* F7 -> F7 */
-99 0 5 8 /* F3 -> F3 */
-100 0 3 1 /* F8 -> F8 */
-#101 -1 -1 0 /* F9 -> (no key) */
-#103 -1 -1 0 /* F11 -> (no key) */
-#109 -1 -1 0 /* F10 -> (no key) */
-#111 -1 -1 0 /* F12 -> (no key) */
-115 6 3 8 /* Home -> CLR/HOME */
-116 6 6 8 /* PgUp -> Up Arrow */
-118 0 5 1 /* F4 -> F4 */
-120 0 4 1 /* F2 -> F2 */
-121 6 0 8 /* PgDown -> Pound */
-122 0 4 8 /* F1 -> F1 */
-123 0 2 1 /* Left -> CRSR LEFT */
-124 0 2 8 /* Right -> CRSR RIGHT */
-125 0 7 8 /* Down -> CRSR DOWN */
-126 0 7 1 /* Up -> CRSR UP */
-
-#
-# Joystick 1
-#
-#KP_0 -1 0
-#KP_1 -1 1
-#KP_2 -1 2
-#KP_3 -1 3
-#KP_4 -1 4
-#KP_5 -1 5
-#KP_6 -1 6
-#KP_7 -1 7
-#KP_8 -1 8
-#KP_9 -1 9
-
-123 -2 4 /* Left -> Joy2 LEFT */
-124 -2 6 /* Right -> Joy2 RIGHT */
-125 -2 2 /* Down -> Joy2 DOWN */
-126 -2 8 /* Up -> Joy2 UP */
-52 -2 0 /* Enter -> Joy2 BUTTON */
-#
-# Joystick 2
-#
-#w -2 7
-#e -2 8
-#r -2 9
-#s -2 4
-#d -2 5
-#f -2 6
-#x -2 1
-#c -2 2
-#v -2 3
-#space -2 0
-
-# Restore key mappings
-117 -3 0 /* Del -> RESTORE */
Copied: trunk/vice/data/C64/osx_sym_de.vkm (from rev 18806, tags/chris/v1.22.15-cocoa-port/data/C64/osx_sym_de.vkm)
===================================================================
--- trunk/vice/data/C64/osx_sym_de.vkm (rev 0)
+++ trunk/vice/data/C64/osx_sym_de.vkm 2008-05-25 18:59:05 UTC (rev 18808)
@@ -0,0 +1,154 @@
+# VICE keyboard mapping file
+#
+# A Keyboard map is read in as patch to the current map.
+#
+# File format:
+# - comment lines start with '#'
+# - keyword lines start with '!keyword'
+# - normal line has 'keysym/scancode row column shiftflag'
+#
+# Keywords and their lines are:
+# '!CLEAR' clear whole table
+# '!INCLUDE filename' read file as mapping file
+# '!LSHIFT row col' left shift keyboard row/column
+# '!RSHIFT row col' right shift keyboard row/column
+# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
+# '!UNDEF keysym' remove keysym from table
+#
+# Shiftflag can have the values:
+# 0 key is not shifted for this keysym
+# 1 key is shifted for this keysym
+# 2 left shift
+# 4 right shift
+# 8 key can be shifted or not with this keysym
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
+
+!CLEAR
+!LSHIFT 1 7
+!RSHIFT 6 4
+!VSHIFT RSHIFT
+
+0 1 2 8 /* A -> A */
+1 1 5 8 /* S -> S */
+2 2 2 8 /* D -> D */
+3 2 5 8 /* F -> F */
+4 3 5 8 /* H -> H */
+5 3 2 8 /* G -> G */
+6 3 1 8 /* Y -> Y */
+7 2 7 8 /* X -> X */
+8 2 4 8 /* C -> C */
+9 3 7 8 /* V -> V */
+10 7 1 8 /* ^ -> Left Arrow */
+11 3 4 8 /* B -> B */
+12 7 6 8 /* Q -> Q */
+13 1 1 8 /* W -> W */
+14 1 6 8 /* E -> E */
+15 2 1 8 /* R -> R */
+
+16 1 4 8 /* Z -> Z */
+17 2 6 8 /* T -> T */
+18 7 0 8 /* 1 -> 1 */
+19 7 3 8 /* 2 -> 2 */
+20 1 0 0 /* 3 -> 3 */
+21 1 3 8 /* 4 -> 4 */
+22 2 3 8 /* 6 -> 6 */
+23 2 0 8 /* 5 -> 5 */
+24 3 0 1 /* ` -> ´ ! */
+25 4 0 8 /* 9 -> 9 */
+26 3 0 32 /* 7 -> 7 !! */
+26 6 7 16 /* 7 -> / !! */
+27 6 7 1 /* \ss -> ? ! */
+28 3 3 8 /* 8 -> 8 */
+29 4 3 32 /* 0 -> 0 !! */
+29 6 5 16 /* 0 -> 0 !! */
+30 5 0 32 /* Plus -> + !! */
+30 6 1 16 /* Plus -> * !! */
+31 4 6 8 /* O -> O */
+
+32 3 6 8 /* U -> U */
+#33 5 6 8 /* "U -> ! */
+34 4 1 8 /* I -> I */
+35 5 1 8 /* P -> P */
+36 0 1 8 /* Return -> Return */
+37 5 2 8 /* L -> L */
+38 4 2 8 /* J -> J */
+#39 6 2 8 /* "A -> ! */
+40 4 5 8 /* K -> K */
+#41 5 5 8 /* "O -> ! */
+42 1 0 33 /* Hash -> # !! */
+42 3 0 1 /* Hash -> ' !! */
+43 5 7 32 /* , -> , !! */
+43 6 2 16 /* , -> ; !! */
+44 5 3 0 /* Minus -> Minus ! */
+45 4 7 8 /* N -> N */
+46 4 4 8 /* M -> M */
+47 5 4 32 /* . -> . !! */
+47 5 5 16 /* . -> : !! */
+
+48 7 2 8 /* TAB -> Ctrl */
+49 7 4 8 /* Space -> Space */
+50 5 7 33 /* < > -> < !! */
+50 5 4 1 /* < > -> > !! */
+51 0 0 8 /* Backspace -> Del */
+52 6 4 4 /* Enter -> Right Shift */
+53 7 7 8 /* ESC -> Run/Stop */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
+56 1 7 2 /* Left Shift -> Left Shift */
+#57 -1 -1 0 /* (no key) */
+58 7 5 8 /* Left Alt -> CBM */
+59 7 2 8 /* Left Ctrl -> CBM */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
+#62 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
+#64 -1 -1 0 /* (no key) */
+#65 -1 -1 0 /* Numpad . -> (no key) */
+#66 -1 -1 0 /* &&& -> (no key) */
+#67 -1 -1 0 /* Numpad * -> (no key) */
+#68 -1 -1 0 /* (no key) */
+#69 -1 -1 0 /* Numpad + -> (no key) */
+#70 -1 -1 0 /* &&& -> (no key) */
+#71 -1 -1 0 /* Numpad Clear -> (no key) */
+#72 -1 -1 0 /* &&& -> (no key) */
+#73 -1 -1 0 /* &&& -> (no key) */
+#74 -1 -1 0 /* &&& -> (no key) */
+#75 -1 -1 0 /* Numpad / -> (no key) */
+#76 -1 -1 0 /* Numpad Enter -> (no key) */
+#77 -1 -1 0 /* &&& -> (no key) */
+#78 -1 -1 0 /* Numpad - -> (no key) */
+
+#82 -1 -1 0 /* Numpad 0 -> (no key) */
+#83 -1 -1 0 /* Numpad 1 -> (no key) */
+#84 -1 -1 0 /* Numpad 2 -> (no key) */
+#85 -1 -1 0 /* Numpad 3 -> (no key) */
+#86 -1 -1 0 /* Numpad 4 -> (no key) */
+#87 -1 -1 0 /* Numpad 5 -> (no key) */
+#88 -1 -1 0 /* Numpad 6 -> (no key) */
+#89 -1 -1 0 /* Numpad 7 -> (no key) */
+#91 -1 -1 0 /* Numpad 8 -> (no key) */
+#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
+96 0 6 8 /* F5 -> F5 */
+97 0 6 1 /* F6 -> F6 */
+98 0 3 8 /* F7 -> F7 */
+99 0 5 8 /* F3 -> F3 */
+100 0 3 1 /* F8 -> F8 */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
+115 6 3 8 /* Home -> CLR/HOME */
+116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
+118 0 5 1 /* F4 -> F4 */
+120 0 4 1 /* F2 -> F2 */
+121 6 0 8 /* PgDown -> Pound */
+122 0 4 8 /* F1 -> F1 */
+123 0 2 1 /* Left -> CRSR LEFT */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
+126 0 7 1 /* Up -> CRSR UP */
Copied: trunk/vice/data/C64/osx_sym_us.vkm (from rev 18806, tags/chris/v1.22.15-cocoa-port/data/C64/osx_sym_us.vkm)
===================================================================
--- trunk/vice/data/C64/osx_sym_us.vkm (rev 0)
+++ trunk/vice/data/C64/osx_sym_us.vkm 2008-05-25 18:59:05 UTC (rev 18808)
@@ -0,0 +1,150 @@
+# VICE keyboard mapping file
+#
+# A Keyboard map is read in as patch to the current map.
+#
+# File format:
+# - comment lines start with '#'
+# - keyword lines start with '!keyword'
+# - normal line has 'keysym/scancode row column shiftflag'
+#
+# Keywords and their lines are:
+# '!CLEAR' clear whole table
+# '!INCLUDE filename' read file as mapping file
+# '!LSHIFT row col' left shift keyboard row/column
+# '!RSHIFT row col' right shift keyboard row/column
+# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
+# '!UNDEF keysym' remove keysym from table
+#
+# Shiftflag can have the values:
+# 0 key is not shifted for this keysym
+# 1 key is shifted for this keysym
+# 2 left shift
+# 4 right shift
+# 8 key can be shifted or not with this keysym
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
+
+!CLEAR
+!LSHIFT 1 7
+!RSHIFT 6 4
+!VSHIFT RSHIFT
+
+0 1 2 8 /* A -> A */
+1 1 5 8 /* S -> S */
+2 2 2 8 /* D -> D */
+3 2 5 8 /* F -> F */
+4 3 5 8 /* H -> H */
+5 3 2 8 /* G -> G */
+6 1 4 8 /* Z -> Z */
+7 2 7 8 /* X -> X ! */
+8 2 4 8 /* C -> C */
+9 3 7 8 /* V -> V */
+10 7 1 8 /* ^ -> Left Arrow */
+11 3 4 8 /* B -> B */
+12 7 6 8 /* Q -> Q */
+13 1 1 8 /* W -> W */
+14 1 6 8 /* E -> E */
+15 2 1 8 /* R -> R */
+
+16 3 1 8 /* Y -> Y ! */
+17 2 6 8 /* T -> T */
+18 7 0 8 /* 1 -> 1 */
+19 7 3 8 /* 2 -> 2 */
+20 1 0 8 /* 3 -> 3 */
+21 1 3 8 /* 4 -> 4 */
+22 2 3 8 /* 6 -> 6 */
+23 2 0 8 /* 5 -> 5 */
+24 6 5 32 /* = -> = ! */
+24 5 0 0 /* = -> + ! */
+25 4 0 8 /* 9 -> 9 */
+26 3 0 8 /* 7 -> 7 */
+27 5 3 0 /* - -> - ! */
+28 3 3 8 /* 8 -> 8 */
+29 4 3 8 /* 0 -> 0 */
+30 6 2 1 /* ] -> ] ! */
+31 4 6 8 /* O -> O */
+
+32 3 6 8 /* U -> U */
+33 5 5 1 /* [ -> [ ! */
+34 4 1 8 /* I -> I */
+35 5 1 8 /* P -> P */
+36 0 1 8 /* Return -> Return */
+37 5 2 8 /* L -> L */
+38 4 2 8 /* J -> J */
+39 3 0 33 /* ' -> ' ! */
+39 7 3 1 /* " -> " ! */
+40 4 5 8 /* K -> K */
+41 6 2 32 /* ; -> ; ! */
+41 5 5 16 /* ; -> : ! */
+42 6 6 8 /* \ -> Up Arrow ! */
+43 5 7 8 /* , -> , */
+44 6 7 8 /* / -> / */
+45 4 7 8 /* N -> N */
+46 4 4 8 /* M -> M */
+47 5 4 8 /* . -> . */
+
+48 7 2 8 /* TAB -> Ctrl */
+49 7 4 8 /* Space -> Space */
+50 7 5 8 /* < > -> CBM */
+51 0 0 8 /* Backspace -> Del */
+52 6 4 4 /* Enter -> Right Shift */
+53 7 7 8 /* ESC -> Run/Stop */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
+56 1 7 2 /* Left Shift -> Left Shift */
+#57 -1 -1 0 /* (no key) */
+58 7 5 8 /* Left Alt -> CBM */
+59 7 2 8 /* Left Ctrl -> CBM */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
+#62 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
+#64 -1 -1 0 /* (no key) */
+#65 -1 -1 0 /* Numpad . -> (no key) */
+#66 -1 -1 0 /* &&& -> (no key) */
+#67 -1 -1 0 /* Numpad * -> (no key) */
+#68 -1 -1 0 /* (no key) */
+#69 -1 -1 0 /* Numpad + -> (no key) */
+#70 -1 -1 0 /* &&& -> (no key) */
+#71 -1 -1 0 /* Numpad Clear -> (no key) */
+#72 -1 -1 0 /* &&& -> (no key) */
+#73 -1 -1 0 /* &&& -> (no key) */
+#74 -1 -1 0 /* &&& -> (no key) */
+#75 -1 -1 0 /* Numpad / -> (no key) */
+#76 -1 -1 0 /* Numpad Enter -> (no key) */
+#77 -1 -1 0 /* &&& -> (no key) */
+#78 -1 -1 0 /* Numpad - -> (no key) */
+
+#82 -1 -1 0 /* Numpad 0 -> (no key) */
+#83 -1 -1 0 /* Numpad 1 -> (no key) */
+#84 -1 -1 0 /* Numpad 2 -> (no key) */
+#85 -1 -1 0 /* Numpad 3 -> (no key) */
+#86 -1 -1 0 /* Numpad 4 -> (no key) */
+#87 -1 -1 0 /* Numpad 5 -> (no key) */
+#88 -1 -1 0 /* Numpad 6 -> (no key) */
+#89 -1 -1 0 /* Numpad 7 -> (no key) */
+#91 -1 -1 0 /* Numpad 8 -> (no key) */
+#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
+96 0 6 8 /* F5 -> F5 */
+97 0 6 1 /* F6 -> F6 */
+98 0 3 8 /* F7 -> F7 */
+99 0 5 8 /* F3 -> F3 */
+100 0 3 1 /* F8 -> F8 */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
+115 6 3 8 /* Home -> CLR/HOME */
+116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
+118 0 5 1 /* F4 -> F4 */
+120 0 4 1 /* F2 -> F2 */
+121 6 0 8 /* PgDown -> Pound */
+122 0 4 8 /* F1 -> F1 */
+123 0 2 1 /* Left -> CRSR LEFT */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
+126 0 7 1 /* Up -> CRSR UP */
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/src/ChangeLog 2008-05-25 18:59:05 UTC (rev 18808)
@@ -1,3 +1,82 @@
+2008-05-25 Christian Vogelgsang <ch...@vo...>
+
+ * arch/unix/archdep.[ch]: made archdep_pref_path const.
+
+ * arch/unix/macosx/make-bindist.sh, arch/unix/macosx/Info.plist:
+ added crt file format. use new icons for Cocoa port.
+
+ * arch/unix/macosx/VICE.xcodeproj/project.pbxproj: added VICE
+ XCode project to manage nib files more easily
+
+ * arch/unix/macosx/cocoa/main.m: store preferences in
+ ~/Library/Preferences/org.viceteam.<emu> now
+
+ * arch/unix/macosx/cocoa/uimon.m,
+ arch/unix/macosx/cocoa/console.m,
+ arch/unix/macosx/cocoa/menu/c64machinecontroller.m: deprecated
+ NSString calls removed
+
+ * arch/unix/macosx/cocoa/kbd.h: added cocoa sym_de keymap
+
+ * arch/unix/macosx/cocoa/videoarch.h,
+ arch/unix/macosx/cocoa/viceapplication.h,
+ arch/unix/macosx/cocoa/vicemachine.h,
+ arch/unix/macosx/cocoa/video.m,
+ arch/unix/macosx/cocoa/vicemachine.m: added canvasId to manage
+ canvas ptr on App side
+
+ * arch/unix/macosx/cocoa/kbd.m: added missing include
+
+ * arch/unix/macosx/cocoa/fullscreen.m: removed obsolete function
+
+ * arch/unix/macosx/cocoa/view/joystickview.m,
+ arch/unix/macosx/cocoa/view/keypressview.m: removed compile
+ warning
+
+ * arch/unix/macosx/cocoa/view/consolewindow.m: fixed output bug
+
+ * arch/unix/macosx/cocoa/view/viceglview.[hm]: added auto hide
+ mouse and menu
+
+ * arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.[hm]:
+ added resource methods
+
+ * arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.[hm]:
+ rewrote drive settings UI
+
+ * arch/unix/macosx/cocoa/dialog/resourcetreeitem.[hm],
+ arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.[hm]:
+ added resource editor
+
+ * arch/unix/macosx/cocoa/dialog/printersettingswindowcontroller.[hm]:
+ added printer settings UI
+
+ * arch/unix/macosx/cocoa/dialog/soundsettingswindowcontroller.[hm]:
+ added sound settings UI
+
+ * arch/unix/macosx/cocoa/dialog/iecdrivesettingswindowcontroller.[hm]:
+ added IEC drive settings UI
+
+ * arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.[hm]:
+ added record media UI
+
+ * arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.[hm]:
+ added keyboard settings UI
+
+ * arch/unix/macosx/cocoa/menu/viceappcontroller.[hm],
+ arch/unix/macosx/cocoa/menu/c64controller.[hm]: added new UI
+ dialogs
+
+ * arch/unix/macosx/cocoa/menu/vicemachinecontroller.[hm]: added
+ machine control functions for new UI features
+
+ * arch/unix/macosx/Resources/English.lproj/*: added nib files
+ for new UI
+
+ * arch/unix/macosx/Makefile.am,
+ arch/unix/macosx/Resources/Makefile.am,
+ arch/unix/macosx/cocoa/dialog/Makefile.am: added new files
+
2008-05-24 Marco van den Heuvel <bla...@ya...>
* Makefile.am: Added a '@' in front of the 'make install' echo.
Modified: trunk/vice/src/arch/unix/archdep.c
===================================================================
--- trunk/vice/src/arch/unix/archdep.c 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/src/arch/unix/archdep.c 2008-05-25 18:59:05 UTC (rev 18808)
@@ -61,7 +61,7 @@
static char *boot_path = NULL;
/* alternate storage of preferences */
-char *archdep_pref_path = NULL; /* NULL -> use home_path + ".vice" */
+const char *archdep_pref_path = NULL; /* NULL -> use home_path + ".vice" */
int archdep_init(int *argc, char **argv)
{
Modified: trunk/vice/src/arch/unix/archdep.h
===================================================================
--- trunk/vice/src/arch/unix/archdep.h 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/src/arch/unix/archdep.h 2008-05-25 18:59:05 UTC (rev 18808)
@@ -106,7 +106,7 @@
extern const char *archdep_home_path(void);
/* set this path to customize the preference storage */
-extern char *archdep_pref_path;
+extern const char *archdep_pref_path;
/* Define the default system directory (where the ROMs are). */
#ifdef __NetBSD__
Modified: trunk/vice/src/arch/unix/macosx/Info.plist
===================================================================
--- trunk/vice/src/arch/unix/macosx/Info.plist 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/src/arch/unix/macosx/Info.plist 2008-05-25 18:59:05 UTC (rev 18808)
@@ -7,7 +7,7 @@
<key>CFBundleGetInfoString</key>
<string>XNAMEX XVERSIONX (C)2008 The VICE Team</string>
<key>CFBundleIconFile</key>
- <string>VICE.icns</string>
+ <string>XNAMEX.icns</string>
<key>CFBundleIdentifier</key>
<string>org.viceteam.XNAMEX</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: trunk/vice/src/arch/unix/macosx/Makefile.am
===================================================================
--- trunk/vice/src/arch/unix/macosx/Makefile.am 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/src/arch/unix/macosx/Makefile.am 2008-05-25 18:59:05 UTC (rev 18808)
@@ -24,7 +24,6 @@
joy.h
EXTRA_DIST = \
- VICE.icns \
Info.plist \
make-bindist.sh \
x11-launcher.sh \
Modified: trunk/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/classes.nib
===================================================================
--- trunk/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/classes.nib 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/classes.nib 2008-05-25 18:59:05 UTC (rev 18808)
@@ -1,66 +1,81 @@
-{
- IBClasses = (
- {
- ACTIONS = {
- changedDriveExpansion2000 = id;
- changedDriveExpansion4000 = id;
- changedDriveExpansion6000 = id;
- changedDriveExpansion8000 = id;
- changedDriveExpansionA000 = id;
- changedDriveType = id;
- changedIdleMethod = id;
- changedTrackHandling = id;
- toggledParallelCable = id;
- };
- CLASS = DriveSettingsWindowController;
- LANGUAGE = ObjC;
- OUTLETS = {
- "driveExpansion0_2000" = NSButton;
- "driveExpansion0_4000" = NSButton;
- "driveExpansion0_6000" = NSButton;
- "driveExpansion0_8000" = NSButton;
- "driveExpansion0_A000" = NSButton;
- "driveExpansion1_2000" = NSButton;
- "driveExpansion1_4000" = NSButton;
- "driveExpansion1_6000" = NSButton;
- "driveExpansion1_8000" = NSButton;
- "driveExpansion1_A000" = NSButton;
- "driveExpansion2_2000" = NSButton;
- "driveExpansion2_4000" = NSButton;
- "driveExpansion2_6000" = NSButton;
- "driveExpansion2_8000" = NSButton;
- "driveExpansion2_A000" = NSButton;
- "driveExpansion3_2000" = NSButton;
- "driveExpansion3_4000" = NSButton;
- "driveExpansion3_6000" = NSButton;
- "driveExpansion3_8000" = NSButton;
- "driveExpansion3_A000" = NSButton;
- driveType0 = NSMatrix;
- driveType1 = NSMatrix;
- driveType2 = NSMatrix;
- driveType3 = NSMatrix;
- idleMethod0 = NSMatrix;
- idleMethod1 = NSMatrix;
- idleMethod2 = NSMatrix;
- idleMethod3 = NSMatrix;
- parallelCable0 = NSButton;
- parallelCable1 = NSButton;
- parallelCable2 = NSButton;
- parallelCable3 = NSButton;
- tabView = NSTabView;
- trackHandling0 = NSMatrix;
- trackHandling1 = NSMatrix;
- trackHandling2 = NSMatrix;
- trackHandling3 = NSMatrix;
- };
- SUPERCLASS = VICEResourceWindowController;
- },
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {
- CLASS = VICEResourceWindowController;
- LANGUAGE = ObjC;
- SUPERCLASS = NSWindowController;
- }
- );
- IBVersion = 1;
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>CLASS</key>
+ <string>VICEResourceWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSWindowController</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>changedDriveExpansion2000</key>
+ <string>id</string>
+ <key>changedDriveExpansion4000</key>
+ <string>id</string>
+ <key>changedDriveExpansion6000</key>
+ <string>id</string>
+ <key>changedDriveExpansion8000</key>
+ <string>id</string>
+ <key>changedDriveExpansionA000</key>
+ <string>id</string>
+ <key>changedDriveType</key>
+ <string>id</string>
+ <key>changedIdleMethod</key>
+ <string>id</string>
+ <key>changedTrackHandling</key>
+ <string>id</string>
+ <key>toggleDrive</key>
+ <string>id</string>
+ <key>toggledParallelCable</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>DriveSettingsWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>driveChooser</key>
+ <string>NSSegmentedControl</string>
+ <key>driveExpansion_2000</key>
+ <string>NSButton</string>
+ <key>driveExpansion_4000</key>
+ <string>NSButton</string>
+ <key>driveExpansion_6000</key>
+ <string>NSButton</string>
+ <key>driveExpansion_8000</key>
+ <string>NSButton</string>
+ <key>driveExpansion_A000</key>
+ <string>NSButton</string>
+ <key>driveType</key>
+ <string>NSMatrix</string>
+ <key>idleMethod</key>
+ <string>NSMatrix</string>
+ <key>parallelCable</key>
+ <string>NSButton</string>
+ <key>trackHandling</key>
+ <string>NSMatrix</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>VICEResourceWindowController</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Modified: trunk/vice/src/arc...
[truncated message content] |