vice-emu-commit Mailing List for VICE (Page 1056)

Versatile Commodore Emulator

Brought to you by: blackystardust, gpz

vice-emu-commit — Commit notifications for the source server

You can subscribe to this list here.

2008	Jan	Feb	Mar	Apr (38)	May (60)	Jun (122)	Jul (148)	Aug (178)	Sep (151)	Oct (131)	Nov (208)	Dec (129)
2009	Jan (193)	Feb (209)	Mar (221)	Apr (243)	May (165)	Jun (168)	Jul (198)	Aug (161)	Sep (103)	Oct (98)	Nov (168)	Dec (99)
2010	Jan (263)	Feb (156)	Mar (57)	Apr (93)	May (85)	Jun (124)	Jul (57)	Aug (58)	Sep (113)	Oct (148)	Nov (114)	Dec (193)
2011	Jan (200)	Feb (207)	Mar (91)	Apr (91)	May (142)	Jun (104)	Jul (115)	Aug (137)	Sep (266)	Oct (91)	Nov (85)	Dec (186)
2012	Jan (98)	Feb (146)	Mar (160)	Apr (99)	May (59)	Jun (257)	Jul (84)	Aug (103)	Sep (169)	Oct (206)	Nov (90)	Dec (296)
2013	Jan (294)	Feb (130)	Mar (36)	Apr (14)	May (51)	Jun (74)	Jul (180)	Aug (85)	Sep (26)	Oct (45)	Nov (29)	Dec (21)
2014	Jan (56)	Feb (40)	Mar (57)	Apr (30)	May (31)	Jun (11)	Jul (107)	Aug (135)	Sep (142)	Oct (195)	Nov (139)	Dec (133)
2015	Jan (293)	Feb (161)	Mar (146)	Apr (85)	May (139)	Jun (51)	Jul (21)	Aug (24)	Sep (29)	Oct (136)	Nov (212)	Dec (118)
2016	Jan (119)	Feb (165)	Mar (229)	Apr (219)	May (134)	Jun (119)	Jul (134)	Aug (236)	Sep (203)	Oct (215)	Nov (300)	Dec (140)
2017	Jan (188)	Feb (20)	Mar (147)	Apr (198)	May (26)	Jun (21)	Jul (67)	Aug (219)	Sep (209)	Oct (194)	Nov (144)	Dec (99)
2018	Jan (139)	Feb (122)	Mar (116)	Apr (85)	May (232)	Jun (181)	Jul (190)	Aug (105)	Sep (92)	Oct (178)	Nov (105)	Dec (86)
2019	Jan (119)	Feb (79)	Mar (74)	Apr (117)	May (115)	Jun (307)	Jul (107)	Aug (131)	Sep (103)	Oct (60)	Nov (118)	Dec (70)
2020	Jan (114)	Feb (103)	Mar (77)	Apr (121)	May (193)	Jun (110)	Jul (214)	Aug (210)	Sep (179)	Oct (260)	Nov (237)	Dec (334)
2021	Jan (163)	Feb (186)	Mar (58)	Apr (81)	May (108)	Jun (175)	Jul (154)	Aug (180)	Sep (217)	Oct (204)	Nov (232)	Dec (190)
2022	Jan (253)	Feb (134)	Mar (229)	Apr (190)	May (125)	Jun (70)	Jul (8)	Aug (22)	Sep (19)	Oct (33)	Nov (94)	Dec (164)
2023	Jan (158)	Feb (366)	Mar (272)	Apr (109)	May (198)	Jun (226)	Jul (200)	Aug (94)	Sep (108)	Oct (62)	Nov (175)	Dec (116)
2024	Jan (35)	Feb (40)	Mar (51)	Apr (89)	May (24)	Jun (26)	Jul (53)	Aug (71)	Sep (23)	Oct (11)	Nov (22)	Dec (58)
2025	Jan (26)	Feb (40)	Mar (107)	Apr (39)	May (35)	Jun (20)	Jul (11)	Aug (24)	Sep (35)	Oct (28)	Nov (14)	Dec

Flat | Threaded

<< < 1 .. 1054 1055 1056 1057 1058 .. 1071 > >> (Page 1056 of 1071)

[Vice-emu-commit] SF.net SVN: vice-emu:[19120] trunk/vice/src/arch/unix/gui/uic64dtv.c

From: <st...@us...> - 2008-08-12 16:49:10

Revision: 19120
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19120&view=rev
Author:   strik
Date:     2008-08-12 16:49:19 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
UI_CALLBACK(set_c64dtv_rom_name):
Make use of `ui_select_file(...)' for dtvrom selection.

Modified Paths:
--------------
    trunk/vice/src/arch/unix/gui/uic64dtv.c

Modified: trunk/vice/src/arch/unix/gui/uic64dtv.c
===================================================================
--- trunk/vice/src/arch/unix/gui/uic64dtv.c	2008-08-11 18:34:45 UTC (rev 19119)
+++ trunk/vice/src/arch/unix/gui/uic64dtv.c	2008-08-12 16:49:19 UTC (rev 19120)
@@ -40,8 +40,29 @@
 
 UI_CALLBACK(set_c64dtv_rom_name)
 {
-    uilib_select_string((char *)UI_MENU_CB_PARAM, _("C64DTV ROM image name"),
-                        _("Name:"));
+    char *filename;
+    ui_button_t button;
+    static char *last_dir;
+
+    filename = ui_select_file(_("C64DTV ROM image name"),
+			      NULL, 0, 0, last_dir,
+			      "*.[bB][iI][nN]",
+			      &button, 0, NULL);
+
+    switch (button) {
+    case UI_BUTTON_OK:
+	resources_set_string("c64dtvromfilename", filename);
+	if (last_dir)
+	    lib_free(last_dir);
+	util_fname_split(filename, &last_dir, NULL);
+	break;
+    default:
+	/* Do nothing special. */
+	break;
+    }
+    if (filename != NULL)
+	lib_free(filename);
+
 }
 
 static ui_menu_entry_t c64dtv_revision_submenu[] = {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19119] trunk/vice/Makefile.am

From: <st...@us...> - 2008-08-11 18:34:41

Revision: 19119
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19119&view=rev
Author:   strik
Date:     2008-08-11 18:34:45 +0000 (Mon, 11 Aug 2008)

Log Message:
-----------
If there is no ChangeLog file, generate a dummy stub.

Modified Paths:
--------------
    trunk/vice/Makefile.am

Modified: trunk/vice/Makefile.am
===================================================================
--- trunk/vice/Makefile.am	2008-08-11 17:59:29 UTC (rev 19118)
+++ trunk/vice/Makefile.am	2008-08-11 18:34:45 UTC (rev 19119)
@@ -38,6 +38,12 @@
 
 install: installvice
 
+# If we have no ChangeLog (which should be generated from SVN), generate a
+# dummy one.
+
+ChangeLog:
+	touch ChangeLog
+
 if AMIGA_COMPILE
 bindist:
 	$(SHELL) @ARCH_SRC_DIR@/make-bindist.sh $(STRIP) $(VICE_VERSION) $(host_cpu) $(host_os) nozip $(top_srcdir) $(EXEEXT)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19118] trunk/vice

From: <st...@us...> - 2008-08-11 18:03:32

Revision: 19118
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19118&view=rev
Author:   strik
Date:     2008-08-11 17:59:29 +0000 (Mon, 11 Aug 2008)

Log Message:
-----------
Added C64DTV support.

Modified Paths:
--------------
    trunk/vice/Makefile.am
    trunk/vice/build/minix3/build.sh
    trunk/vice/configure.in
    trunk/vice/data/Makefile.am
    trunk/vice/po/POTFILES.in
    trunk/vice/src/6510core.c
    trunk/vice/src/Makefile.am
    trunk/vice/src/arch/amigaos/Makefile.am
    trunk/vice/src/arch/amigaos/intl.c
    trunk/vice/src/arch/amigaos/intl.txt
    trunk/vice/src/arch/amigaos/make-bindist.sh
    trunk/vice/src/arch/amigaos/uires.h
    trunk/vice/src/arch/beos/Makefile.am
    trunk/vice/src/arch/beos/constants.h
    trunk/vice/src/arch/beos/make-bindist.sh
    trunk/vice/src/arch/beos/ui_file.cc
    trunk/vice/src/arch/beos/ui_file.h
    trunk/vice/src/arch/beos/ui_sid.cc
    trunk/vice/src/arch/beos/vicemenu.cc
    trunk/vice/src/arch/msdos/Makefile.am
    trunk/vice/src/arch/msdos/make-bindist.sh
    trunk/vice/src/arch/msdos/ui.c
    trunk/vice/src/arch/msdos/uisid.c
    trunk/vice/src/arch/os2/Makefile.am
    trunk/vice/src/arch/os2/dialogs/dialogs.rc
    trunk/vice/src/arch/os2/dialogs/dlg-fileio.c
    trunk/vice/src/arch/os2/dialogs/dragndrop.c
    trunk/vice/src/arch/os2/dialogs/menubar.c
    trunk/vice/src/arch/os2/dialogs/menubar.h
    trunk/vice/src/arch/os2/dialogs/menubar.rc
    trunk/vice/src/arch/os2/install.cmd
    trunk/vice/src/arch/os2/makedist.cmd
    trunk/vice/src/arch/os2/ui.c
    trunk/vice/src/arch/os2/vac++/Makefile.am
    trunk/vice/src/arch/os2/vac++/config.h
    trunk/vice/src/arch/os2/vac++/incl/monitor.icc
    trunk/vice/src/arch/os2/vac++/incl/vicii.icc
    trunk/vice/src/arch/os2/vac++/x128/X128.ICC
    trunk/vice/src/arch/os2/vac++/x64/X64.ICC
    trunk/vice/src/arch/os2/vac++/xcbm2/Xcbm2.ICC
    trunk/vice/src/arch/os2/vsyncarch.c
    trunk/vice/src/arch/os2/watcom/c128c64.tgt
    trunk/vice/src/arch/os2/watcom/c64.tgt
    trunk/vice/src/arch/os2/watcom/config.h
    trunk/vice/src/arch/os2/watcom/monitor.tgt
    trunk/vice/src/arch/os2/watcom/vice.wpj
    trunk/vice/src/arch/os2/watcom/vicii.tgt
    trunk/vice/src/arch/os2/watcom/x128.tgt
    trunk/vice/src/arch/os2/watcom/x64.tgt
    trunk/vice/src/arch/os2/watcom/xcbm2.tgt
    trunk/vice/src/arch/unix/Makefile.am
    trunk/vice/src/arch/unix/gui/Makefile.am
    trunk/vice/src/arch/unix/gui/uidrive.c
    trunk/vice/src/arch/unix/gui/uidrive.h
    trunk/vice/src/arch/unix/gui/uisid.c
    trunk/vice/src/arch/unix/hpux/make-bindist.sh
    trunk/vice/src/arch/unix/icon.h
    trunk/vice/src/arch/unix/qnx4/make-bindist.sh
    trunk/vice/src/arch/unix/qnx6/make-bindist.sh
    trunk/vice/src/arch/unix/sco_sol/make-bindist.sh
    trunk/vice/src/arch/unix/skyos/make-bindist.sh
    trunk/vice/src/arch/unix/x11/Makefile.am
    trunk/vice/src/arch/unix/x11/xaw/Makefile.am
    trunk/vice/src/arch/win32/Makefile.am
    trunk/vice/src/arch/win32/arch.dsp
    trunk/vice/src/arch/win32/intl.c
    trunk/vice/src/arch/win32/make-bindist.sh
    trunk/vice/src/arch/win32/make-msvc-bindist.bat
    trunk/vice/src/arch/win32/monitor.dsp
    trunk/vice/src/arch/win32/resdialogs.txt
    trunk/vice/src/arch/win32/resmenu.txt
    trunk/vice/src/arch/win32/ui.c
    trunk/vice/src/arch/win32/vice.dsw
    trunk/vice/src/arch/win32/vicii.dsp
    trunk/vice/src/arch/win32/watcom/arch.tgt
    trunk/vice/src/arch/win32/watcom/c64.tgt
    trunk/vice/src/arch/win32/watcom/make-watcom-bindist.bat
    trunk/vice/src/arch/win32/watcom/monitor.tgt
    trunk/vice/src/arch/win32/watcom/vice.wpj
    trunk/vice/src/arch/win32/watcom/vicii.tgt
    trunk/vice/src/arch/win32/watcom/x128.tgt
    trunk/vice/src/arch/win32/watcom/x64.tgt
    trunk/vice/src/arch/win32/watcom/xcbm2.tgt
    trunk/vice/src/autostart.c
    trunk/vice/src/c64/Makefile.am
    trunk/vice/src/c64/c64mem.h
    trunk/vice/src/c64ui.h
    trunk/vice/src/machine.h
    trunk/vice/src/maincpu.c
    trunk/vice/src/maincpu.h
    trunk/vice/src/monitor/Makefile.am
    trunk/vice/src/monitor/mon_drive.c
    trunk/vice/src/monitor/mon_file.c
    trunk/vice/src/monitor/mon_lex.c
    trunk/vice/src/monitor/mon_lex.l
    trunk/vice/src/monitor/mon_memory.c
    trunk/vice/src/monitor/mon_parse.c
    trunk/vice/src/monitor/mon_parse.y
    trunk/vice/src/monitor/mon_register.h
    trunk/vice/src/monitor/monitor.c
    trunk/vice/src/monitor/montypes.h
    trunk/vice/src/monitor.h
    trunk/vice/src/raster/raster-line.c
    trunk/vice/src/raster/raster.c
    trunk/vice/src/raster/raster.h
    trunk/vice/src/resid/Makefile.am
    trunk/vice/src/resid/envelope.cc
    trunk/vice/src/resid/envelope.h
    trunk/vice/src/resid/sid.cc
    trunk/vice/src/resid/sid.h
    trunk/vice/src/resid/siddefs.h
    trunk/vice/src/resid/siddefs.h.in
    trunk/vice/src/resid/voice.cc
    trunk/vice/src/resid/wave.cc
    trunk/vice/src/resid/wave.h
    trunk/vice/src/sid/fastsid.c
    trunk/vice/src/sid/resid.cc
    trunk/vice/src/sid/sid-cmdline-options.c
    trunk/vice/src/sid/sid-resources.c
    trunk/vice/src/sid/sid.h
    trunk/vice/src/tape/tape.c
    trunk/vice/src/translate.c
    trunk/vice/src/translate.txt
    trunk/vice/src/traps.c
    trunk/vice/src/vicii/Makefile.am
    trunk/vice/src/vicii/vicii-badline.c
    trunk/vice/src/vicii/vicii-fetch.c
    trunk/vice/src/vicii/vicii-irq.c
    trunk/vice/src/vicii/vicii-mem.c
    trunk/vice/src/vicii/vicii-mem.h
    trunk/vice/src/vicii/vicii.c
    trunk/vice/src/vicii/viciitypes.h
    trunk/vice/src/vicii.h
    trunk/vice/src/video.h

Added Paths:
-----------
    trunk/vice/data/C64DTV/
    trunk/vice/data/C64DTV/Makefile.am
    trunk/vice/data/C64DTV/ROdflt.vkm
    trunk/vice/data/C64DTV/amiga_pos.vkm
    trunk/vice/data/C64DTV/amiga_sym.vkm
    trunk/vice/data/C64DTV/basic
    trunk/vice/data/C64DTV/beos_pos.vkm
    trunk/vice/data/C64DTV/beos_sym.vkm
    trunk/vice/data/C64DTV/c64hq.vpl
    trunk/vice/data/C64DTV/c64mem.sym
    trunk/vice/data/C64DTV/c64s.vpl
    trunk/vice/data/C64DTV/ccs64.vpl
    trunk/vice/data/C64DTV/chargen
    trunk/vice/data/C64DTV/default.vpl
    trunk/vice/data/C64DTV/default.vrs
    trunk/vice/data/C64DTV/dos_pos.vkm
    trunk/vice/data/C64DTV/dos_sym.vkm
    trunk/vice/data/C64DTV/frodo.vpl
    trunk/vice/data/C64DTV/godot.vpl
    trunk/vice/data/C64DTV/kernal
    trunk/vice/data/C64DTV/os2.vkm
    trunk/vice/data/C64DTV/os2_sym.vkm
    trunk/vice/data/C64DTV/osx_pos.vkm
    trunk/vice/data/C64DTV/osx_sym_de.vkm
    trunk/vice/data/C64DTV/osx_sym_us.vkm
    trunk/vice/data/C64DTV/pc64.vpl
    trunk/vice/data/C64DTV/vice.vpl
    trunk/vice/data/C64DTV/win_pos.vkm
    trunk/vice/data/C64DTV/win_shortcuts.vsc
    trunk/vice/data/C64DTV/win_sym_de.vkm
    trunk/vice/data/C64DTV/win_sym_us.vkm
    trunk/vice/data/C64DTV/x11_pos.vkm
    trunk/vice/data/C64DTV/x11_sym.vkm
    trunk/vice/src/arch/amigaos/c64dtvui.c
    trunk/vice/src/arch/amigaos/c64dtvuires.h
    trunk/vice/src/arch/amigaos/mui/uic64dtv.c
    trunk/vice/src/arch/amigaos/mui/uic64dtv.h
    trunk/vice/src/arch/amigaos/x64dtvns.c
    trunk/vice/src/arch/beos/c64dtvui.cc
    trunk/vice/src/arch/msdos/c64dtvui.c
    trunk/vice/src/arch/msdos/uic64dtv.c
    trunk/vice/src/arch/msdos/uic64dtv.h
    trunk/vice/src/arch/os2/kbd/kbd-c64dtv.c
    trunk/vice/src/arch/os2/vac++/incl/c64commonc64dtv.icc
    trunk/vice/src/arch/os2/vac++/incl/c64dtv.icc
    trunk/vice/src/arch/os2/vac++/incl/viciidtv.icc
    trunk/vice/src/arch/os2/vac++/x64dtv/
    trunk/vice/src/arch/os2/vac++/x64dtv/X64DTV.ICC
    trunk/vice/src/arch/os2/watcom/c64common.tgt
    trunk/vice/src/arch/os2/watcom/c64dtv.tgt
    trunk/vice/src/arch/os2/watcom/c64dtvc64.tgt
    trunk/vice/src/arch/os2/watcom/viciicommon.tgt
    trunk/vice/src/arch/os2/watcom/viciidtv.tgt
    trunk/vice/src/arch/os2/watcom/x64dtv-dlg-fileio.c
    trunk/vice/src/arch/os2/watcom/x64dtv-dragndrrop.c
    trunk/vice/src/arch/os2/watcom/x64dtv-main.c
    trunk/vice/src/arch/os2/watcom/x64dtv-menubar.c
    trunk/vice/src/arch/os2/watcom/x64dtv-specific.tgt
    trunk/vice/src/arch/os2/watcom/x64dtv-video.c
    trunk/vice/src/arch/os2/watcom/x64dtv-vsyncarch.c
    trunk/vice/src/arch/os2/watcom/x64dtv.tgt
    trunk/vice/src/arch/unix/gui/c64dtvui.c
    trunk/vice/src/arch/unix/gui/uic64dtv.c
    trunk/vice/src/arch/unix/gui/uic64dtv.h
    trunk/vice/src/arch/unix/gui/uidrivec64dtv.c
    trunk/vice/src/arch/unix/gui/uidrivec64dtv.h
    trunk/vice/src/arch/unix/gui/uips2mouse.c
    trunk/vice/src/arch/unix/gui/uips2mouse.h
    trunk/vice/src/arch/unix/skyos/icons/x64dtv.ico
    trunk/vice/src/arch/unix/x11/c64dtvicon.c
    trunk/vice/src/arch/win32/c64c64dtv.dsp
    trunk/vice/src/arch/win32/c64dtv.dsp
    trunk/vice/src/arch/win32/c64dtvstubs.dsp
    trunk/vice/src/arch/win32/c64dtvui.c
    trunk/vice/src/arch/win32/resc64dtv.rc
    trunk/vice/src/arch/win32/uic64dtv.c
    trunk/vice/src/arch/win32/uic64dtv.h
    trunk/vice/src/arch/win32/viciidtv.dsp
    trunk/vice/src/arch/win32/watcom/c64commonc128.tgt
    trunk/vice/src/arch/win32/watcom/c64commonc128c64dtv.tgt
    trunk/vice/src/arch/win32/watcom/c64commonc64dtv.tgt
    trunk/vice/src/arch/win32/watcom/c64dtv.tgt
    trunk/vice/src/arch/win32/watcom/viciicommon.tgt
    trunk/vice/src/arch/win32/watcom/viciidtv.tgt
    trunk/vice/src/arch/win32/watcom/x64dtv.tgt
    trunk/vice/src/arch/win32/watcom/x64dtvmain.c
    trunk/vice/src/arch/win32/x64dtv.dsp
    trunk/vice/src/c64dtv/
    trunk/vice/src/c64dtv/Makefile.am
    trunk/vice/src/c64dtv/c64dtv-cmdline-options.c
    trunk/vice/src/c64dtv/c64dtv-cmdline-options.h
    trunk/vice/src/c64dtv/c64dtv-resources.c
    trunk/vice/src/c64dtv/c64dtv-resources.h
    trunk/vice/src/c64dtv/c64dtv-snapshot.c
    trunk/vice/src/c64dtv/c64dtv-snapshot.h
    trunk/vice/src/c64dtv/c64dtv.c
    trunk/vice/src/c64dtv/c64dtv.h
    trunk/vice/src/c64dtv/c64dtvblitter.c
    trunk/vice/src/c64dtv/c64dtvblitter.h
    trunk/vice/src/c64dtv/c64dtvcart.c
    trunk/vice/src/c64dtv/c64dtvcia1.c
    trunk/vice/src/c64dtv/c64dtvcia2.c
    trunk/vice/src/c64dtv/c64dtvcpu.c
    trunk/vice/src/c64dtv/c64dtvdma.c
    trunk/vice/src/c64dtv/c64dtvdma.h
    trunk/vice/src/c64dtv/c64dtvflash.c
    trunk/vice/src/c64dtv/c64dtvflash.h
    trunk/vice/src/c64dtv/c64dtviec.c
    trunk/vice/src/c64dtv/c64dtvmem.c
    trunk/vice/src/c64dtv/c64dtvmem.h
    trunk/vice/src/c64dtv/c64dtvmeminit.c
    trunk/vice/src/c64dtv/c64dtvmeminit.h
    trunk/vice/src/c64dtv/c64dtvmemrom.c
    trunk/vice/src/c64dtv/c64dtvmemsnapshot.c
    trunk/vice/src/c64dtv/c64dtvmemsnapshot.h
    trunk/vice/src/c64dtv/c64dtvpla.c
    trunk/vice/src/c64dtv/c64dtvsound.c
    trunk/vice/src/c64dtv/c64dtvtfe.c
    trunk/vice/src/c64dtv/flash-trap.c
    trunk/vice/src/c64dtv/flash-trap.h
    trunk/vice/src/c64dtv/hummeradc.c
    trunk/vice/src/c64dtv/hummeradc.h
    trunk/vice/src/monitor/asm6502dtv.c
    trunk/vice/src/monitor/mon_register6502dtv.c
    trunk/vice/src/mos6510dtv.h
    trunk/vice/src/ps2mouse.c
    trunk/vice/src/ps2mouse.h
    trunk/vice/src/vicii/vicii-stubs.c
    trunk/vice/src/vicii/viciidtv-color.c
    trunk/vice/src/vicii/viciidtv-draw.c
    trunk/vice/src/vicii/viciidtv-snapshot.c

Removed Paths:
-------------
    trunk/vice/data/C64DTV/Makefile.am
    trunk/vice/data/C64DTV/ROdflt.vkm
    trunk/vice/data/C64DTV/amiga_pos.vkm
    trunk/vice/data/C64DTV/amiga_sym.vkm
    trunk/vice/data/C64DTV/basic
    trunk/vice/data/C64DTV/beos_pos.vkm
    trunk/vice/data/C64DTV/beos_sym.vkm
    trunk/vice/data/C64DTV/c64hq.vpl
    trunk/vice/data/C64DTV/c64mem.sym
    trunk/vice/data/C64DTV/c64s.vpl
    trunk/vice/data/C64DTV/ccs64.vpl
    trunk/vice/data/C64DTV/chargen
    trunk/vice/data/C64DTV/default.vpl
    trunk/vice/data/C64DTV/default.vrs
    trunk/vice/data/C64DTV/dos_pos.vkm
    trunk/vice/data/C64DTV/dos_sym.vkm
    trunk/vice/data/C64DTV/frodo.vpl
    trunk/vice/data/C64DTV/godot.vpl
    trunk/vice/data/C64DTV/kernal
    trunk/vice/data/C64DTV/os2.vkm
    trunk/vice/data/C64DTV/os2_sym.vkm
    trunk/vice/data/C64DTV/osx_pos.vkm
    trunk/vice/data/C64DTV/osx_sym_de.vkm
    trunk/vice/data/C64DTV/osx_sym_us.vkm
    trunk/vice/data/C64DTV/pc64.vpl
    trunk/vice/data/C64DTV/vice.vpl
    trunk/vice/data/C64DTV/win_pos.vkm
    trunk/vice/data/C64DTV/win_shortcuts.vsc
    trunk/vice/data/C64DTV/win_sym_de.vkm
    trunk/vice/data/C64DTV/win_sym_us.vkm
    trunk/vice/data/C64DTV/x11_pos.vkm
    trunk/vice/data/C64DTV/x11_sym.vkm
    trunk/vice/src/arch/os2/vac++/x64dtv/X64DTV.ICC
    trunk/vice/src/arch/os2/watcom/c128-c64-snapshot.c
    trunk/vice/src/arch/os2/watcom/c128-c64acia1.c
    trunk/vice/src/arch/os2/watcom/c128-c64bus.c
    trunk/vice/src/arch/os2/watcom/c128-c64cia2.c
    trunk/vice/src/arch/os2/watcom/c128-c64datasette.c
    trunk/vice/src/arch/os2/watcom/c128-c64export.c
    trunk/vice/src/arch/os2/watcom/c128-c64iec.c
    trunk/vice/src/arch/os2/watcom/c128-c64io.c
    trunk/vice/src/arch/os2/watcom/c128-c64keyboard.c
    trunk/vice/src/arch/os2/watcom/c128-c64meminit.c
    trunk/vice/src/arch/os2/watcom/c128-c64memrom.c
    trunk/vice/src/arch/os2/watcom/c128-c64parallel.c
    trunk/vice/src/arch/os2/watcom/c128-c64pla.c
    trunk/vice/src/arch/os2/watcom/c128-c64printer.c
    trunk/vice/src/arch/os2/watcom/c128-c64rsuser.c
    trunk/vice/src/arch/os2/watcom/c128-c64sound.c
    trunk/vice/src/arch/os2/watcom/c128-c64tpi.c
    trunk/vice/src/arch/os2/watcom/c128-digimax.c
    trunk/vice/src/arch/os2/watcom/c128-georam.c
    trunk/vice/src/arch/os2/watcom/c128-mmc64.c
    trunk/vice/src/arch/os2/watcom/c128-patchrom.c
    trunk/vice/src/arch/os2/watcom/c128-ramcart.c
    trunk/vice/src/arch/os2/watcom/c128-reu.c
    trunk/vice/src/arch/os2/watcom/c128-tfe.c
    trunk/vice/src/arch/win32/watcom/c128-c64-snapshot.c
    trunk/vice/src/arch/win32/watcom/c128-c64acia1.c
    trunk/vice/src/arch/win32/watcom/c128-c64bus.c
    trunk/vice/src/arch/win32/watcom/c128-c64cia2.c
    trunk/vice/src/arch/win32/watcom/c128-c64datasette.c
    trunk/vice/src/arch/win32/watcom/c128-c64export.c
    trunk/vice/src/arch/win32/watcom/c128-c64iec.c
    trunk/vice/src/arch/win32/watcom/c128-c64io.c
    trunk/vice/src/arch/win32/watcom/c128-c64keyboard.c
    trunk/vice/src/arch/win32/watcom/c128-c64meminit.c
    trunk/vice/src/arch/win32/watcom/c128-c64memrom.c
    trunk/vice/src/arch/win32/watcom/c128-c64parallel.c
    trunk/vice/src/arch/win32/watcom/c128-c64pla.c
    trunk/vice/src/arch/win32/watcom/c128-c64printer.c
    trunk/vice/src/arch/win32/watcom/c128-c64rsuser.c
    trunk/vice/src/arch/win32/watcom/c128-c64sound.c
    trunk/vice/src/arch/win32/watcom/c128-c64tpi.c
    trunk/vice/src/arch/win32/watcom/c128-digimax.c
    trunk/vice/src/arch/win32/watcom/c128-georam.c
    trunk/vice/src/arch/win32/watcom/c128-mmc64.c
    trunk/vice/src/arch/win32/watcom/c128-patchrom.c
    trunk/vice/src/arch/win32/watcom/c128-ramcart.c
    trunk/vice/src/arch/win32/watcom/c128-reu.c
    trunk/vice/src/arch/win32/watcom/c128-tfe.c
    trunk/vice/src/arch/win32/watcom/c64c128.tgt
    trunk/vice/src/c64dtv/Makefile.am
    trunk/vice/src/c64dtv/c64dtv-cmdline-options.c
    trunk/vice/src/c64dtv/c64dtv-cmdline-options.h
    trunk/vice/src/c64dtv/c64dtv-resources.c
    trunk/vice/src/c64dtv/c64dtv-resources.h
    trunk/vice/src/c64dtv/c64dtv-snapshot.c
    trunk/vice/src/c64dtv/c64dtv-snapshot.h
    trunk/vice/src/c64dtv/c64dtv.c
    trunk/vice/src/c64dtv/c64dtv.h
    trunk/vice/src/c64dtv/c64dtvblitter.c
    trunk/vice/src/c64dtv/c64dtvblitter.h
    trunk/vice/src/c64dtv/c64dtvcart.c
    trunk/vice/src/c64dtv/c64dtvcia1.c
    trunk/vice/src/c64dtv/c64dtvcia2.c
    trunk/vice/src/c64dtv/c64dtvcpu.c
    trunk/vice/src/c64dtv/c64dtvdma.c
    trunk/vice/src/c64dtv/c64dtvdma.h
    trunk/vice/src/c64dtv/c64dtvflash.c
    trunk/vice/src/c64dtv/c64dtvflash.h
    trunk/vice/src/c64dtv/c64dtviec.c
    trunk/vice/src/c64dtv/c64dtvmem.c
    trunk/vice/src/c64dtv/c64dtvmem.h
    trunk/vice/src/c64dtv/c64dtvmeminit.c
    trunk/vice/src/c64dtv/c64dtvmeminit.h
    trunk/vice/src/c64dtv/c64dtvmemrom.c
    trunk/vice/src/c64dtv/c64dtvmemsnapshot.c
    trunk/vice/src/c64dtv/c64dtvmemsnapshot.h
    trunk/vice/src/c64dtv/c64dtvpla.c
    trunk/vice/src/c64dtv/c64dtvsound.c
    trunk/vice/src/c64dtv/c64dtvtfe.c
    trunk/vice/src/c64dtv/flash-trap.c
    trunk/vice/src/c64dtv/flash-trap.h
    trunk/vice/src/c64dtv/hummeradc.c
    trunk/vice/src/c64dtv/hummeradc.h

Modified: trunk/vice/Makefile.am
===================================================================
--- trunk/vice/Makefile.am	2008-08-10 17:31:35 UTC (rev 19117)
+++ trunk/vice/Makefile.am	2008-08-11 17:59:29 UTC (rev 19118)
@@ -11,13 +11,18 @@
 	vice.spec \
 	vice-mint.spec
 
-.PHONY: x64 x128 xvic xpet xplus4 xcbm2
+.PHONY: x64 x128 x64dtv xvic xpet xplus4 xcbm2
 x64:
 	(cd src; $(MAKE) x64-all)
 
 x128:
 	(cd src; $(MAKE) x128-all)
 
+if SUPPORT_X64DTV
+x64dtv:
+	(cd src; $(MAKE) x64dtv-all)
+endif
+
 xvic:
 	(cd src; $(MAKE) xvic-all)
 

Modified: trunk/vice/build/minix3/build.sh
===================================================================
--- trunk/vice/build/minix3/build.sh	2008-08-10 17:31:35 UTC (rev 19117)
+++ trunk/vice/build/minix3/build.sh	2008-08-11 17:59:29 UTC (rev 19118)
@@ -1,7 +1,8 @@
 #!/bin/sh
-AR=ar RANLIB=true CC=cc bigsh configure --prefix=/usr/local --without-resid --disable-nls
+binsizes xxl
+AR=ar RANLIB=true CC=cc ./configure --prefix=/usr/local --without-resid --disable-nls
 make
 make install
-for b in x64 x128 xvic xplus4 xpet xcbm2 petcat c1541 cartconv
+for b in x64 x64dtv x128 xvic xplus4 xpet xcbm2 petcat c1541 cartconv
 do chmem +10000000 /usr/local/bin/$b
 done

Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in	2008-08-10 17:31:35 UTC (rev 19117)
+++ trunk/vice/configure.in	2008-08-11 17:59:29 UTC (rev 19118)
@@ -1773,6 +1773,7 @@
   xcbm2_LDFLAGS="-mwindows"
 
   X64_WINRES="\$(top_builddir)/src/arch/win32/resc64.o"
+  X64DTV_WINRES="\$(top_builddir)/src/arch/win32/resc64dtv.o"
   X128_WINRES="\$(top_builddir)/src/arch/win32/resc128.o"
   XVIC_WINRES="\$(top_builddir)/src/arch/win32/resvic20.o"
   XPET_WINRES="\$(top_builddir)/src/arch/win32/respet.o"
@@ -1821,6 +1822,7 @@
 AC_SUBST(xcbm2_LDFLAGS)
 
 AC_SUBST(X64_WINRES)
+AC_SUBST(X64DTV_WINRES)
 AC_SUBST(X128_WINRES)
 AC_SUBST(XVIC_WINRES)
 AC_SUBST(XPET_WINRES)
@@ -1828,6 +1830,16 @@
 AC_SUBST(XCBM2_WINRES)
 
 
+if test x"$is_unix_gp2x" = "xyes" ; then
+  AM_CONDITIONAL(SUPPORT_X64DTV, false)
+else
+  if test x"$is_riscos" = "xyes"; then
+    AM_CONDITIONAL(SUPPORT_X64DTV, false)
+  else
+    AM_CONDITIONAL(SUPPORT_X64DTV, true)
+  fi
+fi
+
 dnl Setup the system-specific object files.
 if test x"$is_unix" = "xyes"; then
   ARCH_DIR="\$(top_builddir)/src/arch/unix"
@@ -2285,6 +2297,7 @@
            data/Makefile
            data/C128/Makefile
            data/C64/Makefile
+           data/C64DTV/Makefile
            data/CBM-II/Makefile
            data/DRIVES/Makefile
            data/PET/Makefile
@@ -2326,6 +2339,7 @@
            src/c128/Makefile
            src/c64/Makefile
            src/c64/cart/Makefile
+           src/c64dtv/Makefile
            src/cbm2/Makefile
            src/core/Makefile
            src/crtc/Makefile


Property changes on: trunk/vice/data/C64DTV
___________________________________________________________________
Added: svn:ignore
   + Makefile
Makefile.in


Deleted: trunk/vice/data/C64DTV/Makefile.am
===================================================================
--- tags/viceplus/v2.0-x64dtv/vice/data/C64DTV/Makefile.am	2008-08-10 17:31:35 UTC (rev 19117)
+++ trunk/vice/data/C64DTV/Makefile.am	2008-08-11 17:59:29 UTC (rev 19118)
@@ -1,37 +0,0 @@
-c64dtvdir = $(VICEDIR)/C64DTV
-
-c64dtv_DATA = \
-	amiga_sym.vkm \
-	amiga_pos.vkm \
-	basic \
-	beos_sym.vkm \
-	beos_pos.vkm \
-	c64hq.vpl \
-	c64mem.sym \
-	c64s.vpl \
-	ccs64.vpl \
-	chargen \
-	default.vpl \
-	default.vrs \
-	dos_sym.vkm \
-	dos_pos.vkm \
-	frodo.vpl \
-	godot.vpl \
-	kernal \
-	os2.vkm \
-	os2_sym.vkm \
-	osx_pos.vkm \
-	osx_sym_de.vkm \
-	osx_sym_us.vkm \
-	pc64.vpl \
-	ROdflt.vkm \
-	vice.vpl \
-	win_shortcuts.vsc \
-	win_sym_de.vkm \
-	win_sym_us.vkm \
-	win_pos.vkm \
-	x11_sym.vkm \
-	x11_pos.vkm
-
-EXTRA_DIST = $(c64dtv_DATA)
-

Copied: trunk/vice/data/C64DTV/Makefile.am (from rev 19117, tags/viceplus/v2.0-x64dtv/vice/data/C64DTV/Makefile.am)
===================================================================
--- trunk/vice/data/C64DTV/Makefile.am	                        (rev 0)
+++ trunk/vice/data/C64DTV/Makefile.am	2008-08-11 17:59:29 UTC (rev 19118)
@@ -0,0 +1,37 @@
+c64dtvdir = $(VICEDIR)/C64DTV
+
+c64dtv_DATA = \
+	amiga_sym.vkm \
+	amiga_pos.vkm \
+	basic \
+	beos_sym.vkm \
+	beos_pos.vkm \
+	c64hq.vpl \
+	c64mem.sym \
+	c64s.vpl \
+	ccs64.vpl \
+	chargen \
+	default.vpl \
+	default.vrs \
+	dos_sym.vkm \
+	dos_pos.vkm \
+	frodo.vpl \
+	godot.vpl \
+	kernal \
+	os2.vkm \
+	os2_sym.vkm \
+	osx_pos.vkm \
+	osx_sym_de.vkm \
+	osx_sym_us.vkm \
+	pc64.vpl \
+	ROdflt.vkm \
+	vice.vpl \
+	win_shortcuts.vsc \
+	win_sym_de.vkm \
+	win_sym_us.vkm \
+	win_pos.vkm \
+	x11_sym.vkm \
+	x11_pos.vkm
+
+EXTRA_DIST = $(c64dtv_DATA)
+

Deleted: trunk/vice/data/C64DTV/ROdflt.vkm
===================================================================
--- tags/viceplus/v2.0-x64dtv/vice/data/C64DTV/ROdflt.vkm	2008-08-10 17:31:35 UTC (rev 19117)
+++ trunk/vice/data/C64DTV/ROdflt.vkm	2008-08-11 17:59:29 UTC (rev 19118)
@@ -1,133 +0,0 @@
-# VICE keyboard mapping file for RISC OS
-#
-# Different file format due to heavy dependency of Vice's on X11
-#
-# File format:
-# - comment lines start with '#'
-# - clear table using !CLEAR
-# - lineformat is keynum row col ['s' [srow scol ['s']]] ["keystr"]
-#   where 's' means activate shift key and srow/scol are keyboard
-#   positions for shifted keys (these should only be used if you want
-#   to map characters that need shift on your RISC OS machine to an
-#   unshifted position on the emulated machine (e.g. '*').
-#   Use row=15, col=15 or no specification to disable a key
-#
-# keynum is the internal key number (see RO3 PRM1-849). keystr is the
-# optional string representation for that key on an english keyboard.
-
-!CLEAR
-
-  0  1  7 "Shft"
-  1  7  2 "Ctrl"
-  2  7  5 "Alt"
-  3  1  7 "ShftL"
-  4  7  2 "CtrlL"
-  5  7  5 "AltL"
-  6  6  4 "ShftR"
-  7  7  2 "CtrlR"
-  8  7  5 "AltR"
-  9 15 15 "Slct"
- 10 15 15 "Menu"
- 11 15 15 "Adjst"
- 16  7  6 "q"
- 17  1  0 "3"
- 18  1  3 "4"
- 19  2  0 "5"
- 20  0  3 "F4"
- 21  3  3 "8"
- 22 15 15 "F7"
- 23  5  3 "-"
- 24  2  3 "6"
- 25  0  2 s "CrsrL"
- 26 15 15 "num6"
- 27 15 15 "num7"
- 28 15 15 "F11"
- 29 15 15 "F12"
- 30 15 15 "F10"
- 31 15 15 "ScrLck"
- 32 15 15 "Print"
- 33  1  1 "w"
- 34  1  6 "e"
- 35  2  6 "t"
- 36  3  0 "7"
- 37  4  1 "i"
- 38  4  0 "9"
- 39  4  3 "0"
- 40  5  3 "-"
- 41  0  7 "CrsrD"
- 42 15 15 "num8"
- 43 15 15 "num9"
- 44  7  7 "Break"
- 45  7  1 "`"
- 46  6  0 "\xA3"
- 47  0  0 "BackSpc"
- 48  7  0 "1"
- 49  7  3 "2"
- 50  2  2 "d"
- 51  2  1 "r"
- 52  2  3 "6"
- 53  3  6 "u"
- 54  4  6 "o"
- 55  5  1 "p"
- 56  5  6 "["
- 57  0  7 s "CrsrU"
- 58  5  0 "num+"
- 59  5  3 "num-"
- 60 15 15 "numEntr"
- 61  0  0 s "Insert"
- 62  6  3 "Home"
- 63 15 15 "PgUp"
- 64  1  7 "CpsLck"
- 65  1  2 "a"
- 66  2  7 "x"
- 67  2  5 "f"
- 68  3  1 "y"
- 69  4  2 "j"
- 70  4  5 "k"
- 71  7  3 "2"
- 72  5  5 ";"
- 73  0  1 "Return"
- 74 15 15 "num/"
- 76 15 15 "num."
- 77 15 15 "numLck"
- 78 15 15 "PgDown"
- 79  6  2 "'"
- 81  1  5 "s"
- 82  2  4 "c"
- 83  3  2 "g"
- 84  3  5 "h"
- 85  4  7 "n"
- 86  5  2 "l"
- 87  5  5 ";"
- 88  6  1 "]"
- 89  0  0 "Delete"
- 90 15 15 "num#"
- 91 15 15 "num*"
- 93  6  5 "="
- 94 15 15 "Extra"
- 96  7  2 "Tab"
- 97  1  4 "z"
- 98  7  4 "Space"
- 99  3  7 "v"
-100  3  4 "b"
-101  4  4 "m"
-102  5  7 ","
-103  5  4 "."
-104  6  7 "/"
-105 15 15 "Copy"
-106 15 15 "num0"
-107 15 15 "num1"
-108 15 15 "num3"
-112  7  7 "Esc"
-113  0  4 "F1"
-114  0  5 "F2"
-115  0  6 "F3"
-116 15 15 "F5"
-117 15 15 "F6"
-118 15 15 "F8"
-119 15 15 "F9"
-120  6  6 "\"
-121  0  2 "CrsrR"
-122 15 15 "num4"
-123 15 15 "num5"
-124 15 15 "num2"

Copied: trunk/vice/data/C64DTV/ROdflt.vkm (from rev 19117, tags/viceplus/v2.0-x64dtv/vice/data/C64DTV/ROdflt.vkm)
===================================================================
--- trunk/vice/data/C64DTV/ROdflt.vkm	                        (rev 0)
+++ trunk/vice/data/C64DTV/ROdflt.vkm	2008-08-11 17:59:29 UTC (rev 19118)
@@ -0,0 +1,133 @@
+# VICE keyboard mapping file for RISC OS
+#
+# Different file format due to heavy dependency of Vice's on X11
+#
+# File format:
+# - comment lines start with '#'
+# - clear table using !CLEAR
+# - lineformat is keynum row col ['s' [srow scol ['s']]] ["keystr"]
+#   where 's' means activate shift key and srow/scol are keyboard
+#   positions for shifted keys (these should only be used if you want
+#   to map characters that need shift on your RISC OS machine to an
+#   unshifted position on the emulated machine (e.g. '*').
+#   Use row=15, col=15 or no specification to disable a key
+#
+# keynum is the internal key number (see RO3 PRM1-849). keystr is the
+# optional string representation for that key on an english keyboard.
+
+!CLEAR
+
+  0  1  7 "Shft"
+  1  7  2 "Ctrl"
+  2  7  5 "Alt"
+  3  1  7 "ShftL"
+  4  7  2 "CtrlL"
+  5  7  5 "AltL"
+  6  6  4 "ShftR"
+  7  7  2 "CtrlR"
+  8  7  5 "AltR"
+  9 15 15 "Slct"
+ 10 15 15 "Menu"
+ 11 15 15 "Adjst"
+ 16  7  6 "q"
+ 17  1  0 "3"
+ 18  1  3 "4"
+ 19  2  0 "5"
+ 20  0  3 "F4"
+ 21  3  3 "8"
+ 22 15 15 "F7"
+ 23  5  3 "-"
+ 24  2  3 "6"
+ 25  0  2 s "CrsrL"
+ 26 15 15 "num6"
+ 27 15 15 "num7"
+ 28 15 15 "F11"
+ 29 15 15 "F12"
+ 30 15 15 "F10"
+ 31 15 15 "ScrLck"
+ 32 15 15 "Print"
+ 33  1  1 "w"
+ 34  1  6 "e"
+ 35  2  6 "t"
+ 36  3  0 "7"
+ 37  4  1 "i"
+ 38  4  0 "9"
+ 39  4  3 "0"
+ 40  5  3 "-"
+ 41  0  7 "CrsrD"
+ 42 15 15 "num8"
+ 43 15 15 "num9"
+ 44  7  7 "Break"
+ 45  7  1 "`"
+ 46  6  0 "\xA3"
+ 47  0  0 "BackSpc"
+ 48  7  0 "1"
+ 49  7  3 "2"
+ 50  2  2 "d"
+ 51  2  1 "r"
+ 52  2  3 "6"
+ 53  3  6 "u"
+ 54  4  6 "o"
+ 55  5  1 "p"
+ 56  5  6 "["
+ 57  0  7 s "CrsrU"
+ 58  5  0 "num+"
+ 59  5  3 "num-"
+ 60 15 15 "numEntr"
+ 61  0  0 s "Insert"
+ 62  6  3 "Home"
+ 63 15 15 "PgUp"
+ 64  1  7 "CpsLck"
+ 65  1  2 "a"
+ 66  2  7 "x"
+ 67  2  5 "f"
+ 68  3  1 "y"
+ 69  4  2 "j"
+ 70  4  5 "k"
+ 71  7  3 "2"
+ 72  5  5 ";"
+ 73  0  1 "Return"
+ 74 15 15 "num/"
+ 76 15 15 "num."
+ 77 15 15 "numLck"
+ 78 15 15 "PgDown"
+ 79  6  2 "'"
+ 81  1  5 "s"
+ 82  2  4 "c"
+ 83  3  2 "g"
+ 84  3  5 "h"
+ 85  4  7 "n"
+ 86  5  2 "l"
+ 87  5  5 ";"
+ 88  6  1 "]"
+ 89  0  0 "Delete"
+ 90 15 15 "num#"
+ 91 15 15 "num*"
+ 93  6  5 "="
+ 94 15 15 "Extra"
+ 96  7  2 "Tab"
+ 97  1  4 "z"
+ 98  7  4 "Space"
+ 99  3  7 "v"
+100  3  4 "b"
+101  4  4 "m"
+102  5  7 ","
+103  5  4 "."
+104  6  7 "/"
+105 15 15 "Copy"
+106 15 15 "num0"
+107 15 15 "num1"
+108 15 15 "num3"
+112  7  7 "Esc"
+113  0  4 "F1"
+114  0  5 "F2"
+115  0  6 "F3"
+116 15 15 "F5"
+117 15 15 "F6"
+118 15 15 "F8"
+119 15 15 "F9"
+120  6  6 "\"
+121  0  2 "CrsrR"
+122 15 15 "num4"
+123 15 15 "num5"
+124 15 15 "num2"

Deleted: trunk/vice/data/C64DTV/amiga_pos.vkm
===================================================================
--- tags/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_pos.vkm	2008-08-10 17:31:35 UTC (rev 19117)
+++ trunk/vice/data/C64DTV/amiga_pos.vkm	2008-08-11 17:59:29 UTC (rev 19118)
@@ -1,146 +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 7 1 8                 /*            ` -> Left Arrow   */
-1 7 0 8                 /*            1 -> 1            */
-2 7 3 8                 /*            2 -> 2            */
-3 1 0 8                 /*            3 -> 3            */
-4 1 3 8                 /*            4 -> 4            */
-5 2 0 8                 /*            5 -> 5            */
-6 2 3 8                 /*            6 -> 6            */
-7 3 0 8                 /*            7 -> 7            */
-8 3 3 8                 /*            8 -> 8            */
-9 4 0 8                 /*            9 -> 9            */
-10 4 3 8                /*            0 -> 0            */
-11 5 0 8                /*         Plus -> Plus         */
-12 5 3 8                /*            \xB4 -> Minus        */
-13 6 3 8                /*            \ -> CLR/HOME     */
-#14 -1 -1 0             /*              -> (no key)     */
-#15 -1 -1 0             /*     KEYPAD 0 -> (no key)     */
-16 7 6 8                /*            Q -> Q            */
-17 1 1 8                /*            W -> W            */
-18 1 6 8                /*            E -> E            */
-19 2 1 8                /*            R -> R            */
-20 2 6 8                /*            T -> T            */
-21 3 1 8                /*            Y -> Y            */
-22 3 6 8                /*            U -> U            */
-23 4 1 8                /*            I -> I            */
-24 4 6 8                /*            O -> O            */
-25 5 1 8                /*            P -> P            */
-26 5 6 8                /*        (\xE5) [ -> @            */
-27 6 1 8                /*        (\xA8) ] -> *            */
-#28 -1 -1 0             /*              -> (no key)     */
-#29 -1 -1 0             /*     KEYPAD 1 -> (no key)     */
-#30 -1 -1 0             /*     KEYPAD 2 -> (no key)     */
-#31 -1 -1 0             /*     KEYPAD 3 -> (no key)     */
-32 1 2 8                /*            A -> A            */
-33 1 5 8                /*            S -> S            */
-34 2 2 8                /*            D -> D            */
-35 2 5 8                /*            F -> F            */
-36 3 2 8                /*            G -> G            */
-37 3 5 8                /*            H -> H            */
-38 4 2 8                /*            J -> J            */
-39 4 5 8                /*            K -> K            */
-40 5 2 8                /*            L -> L            */
-41 5 5 8                /*            ; -> :            */
-42 6 2 8                /*            ' -> ;            */
-43 6 5 8                /*            \ -> =            */
-#44 -1 -1 0             /*              -> (no key)     */
-#45 -1 -1 0             /*     KEYPAD 4 -> (no key)     */
-#46 -1 -1 0             /*     KEYPAD 5 -> (no key)     */
-#47 -1 -1 0             /*     KEYPAD 6 -> (no key)     */
-48 6 5 8                /*            < -> =            */
-49 1 4 8                /*            Z -> Z            */
-50 2 7 8                /*            X -> X            */
-51 2 4 8                /*            C -> C            */
-52 3 7 8                /*            V -> V            */
-53 3 4 8                /*            B -> B            */
-54 4 7 8                /*            N -> N            */
-55 4 4 8                /*            M -> M            */
-56 5 7 8                /*            , -> ,            */
-57 5 4 8                /*            . -> .            */
-58 6 7 8                /*            / -> /            */
-#59 -1 -1 0             /*              -> (no key)     */
-#60 -1 -1 0             /*   KEYPAD DEL -> (no key)     */
-#61 -1 -1 0             /*     KEYPAD 7 -> (no key)     */
-#62 -1 -1 0             /*     KEYPAD 8 -> (no key)     */
-#63 -1 -1 0             /*     KEYPAD 9 -> (no key)     */
-64 7 4 8                /*        Space -> Space        */
-65 0 0 8                /*    Backspace -> Del          */
-66 7 2 8                /*          TAB -> Ctrl         */
-#67 -1 -1 0             /* KEYPAD ENTER -> (no key)     */
-68 0 1 8                /*       Return -> Return       */
-69 7 7 8                /*          ESC -> Run/Stop     */
-70 6 0 8                /*          DEL -> Pound        */
-#71 -1 -1 0             /*              -> (no key)     */
-#72 -1 -1 0             /*              -> (no key)     */
-#73 -1 -1 0             /*              -> (no key)     */
-#74 -1 -1 0             /*     KEYPAD - -> (no key)     */
-#75 -1 -1 0             /*              -> (no key)     */
-76 0 7 1                /*           Up -> CRSR UP      */
-77 0 7 8                /*         Down -> CRSR DOWN    */
-78 0 2 8                /*        Right -> CRSR RIGHT   */
-79 0 2 1                /*         Left -> CRSR LEFT    */
-80 0 4 8                /*           F1 -> F1           */
-81 0 4 1                /*           F2 -> F2           */
-82 0 5 8                /*           F3 -> F3           */
-83 0 5 1                /*           F4 -> F4           */
-84 0 6 8                /*           F5 -> F5           */
-85 0 6 1                /*           F6 -> F6           */
-86 0 3 8                /*           F7 -> F7           */
-87 0 3 1                /*           F8 -> F8           */
-#88 -1 -1 0             /*           F9 -> (no key)     */
-#89 -1 -1 0             /*          F10 -> (no key)     */
-#90 -1 -1 0             /*      NUMLOCK -> (no key)     */
-#91 -1 -1 0             /*      SCRLOCK -> (no key)     */
-#92 -1 -1 0             /* KEYPAD SLASH -> (no key)     */
-#93 -1 -1 0             /*     KEYPAD * -> (no key)     */
-#94 -1 -1 0             /*     KEYPAD + -> (no key)     */
-95 6 6 8                /*         HELP -> Up Arrow     */
-96 1 7 2                /*   Left Shift -> Left Shift   */
-97 6 4 4                /*  Right Shift -> Right Shift  */
-#98 -1 -1 0             /*     CAPSLOCK -> (no key)     */
-99 7 5 8                /*         Ctrl -> CBM          */
-#100 -1 -1 0            /*     LEFT ALT -> (no key)     */
-#101 -1 -1 0            /*    RIGHT ALT -> (no key)     */
-#102 -1 -1 0            /*   LEFT AMIGA -> (no key)     */
-#103 -1 -1 0            /*  RIGHT AMIGA -> (no key)     */
-
-# Restore key mappings
-89 -3 0                 /*          F10 -> RESTORE      */
-

Copied: trunk/vice/data/C64DTV/amiga_pos.vkm (from rev 19117, tags/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_pos.vkm)
===================================================================
--- trunk/vice/data/C64DTV/amiga_pos.vkm	                        (rev 0)
+++ trunk/vice/data/C64DTV/amiga_pos.vkm	2008-08-11 17:59:29 UTC (rev 19118)
@@ -0,0 +1,146 @@
+# 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 7 1 8                 /*            ` -> Left Arrow   */
+1 7 0 8                 /*            1 -> 1            */
+2 7 3 8                 /*            2 -> 2            */
+3 1 0 8                 /*            3 -> 3            */
+4 1 3 8                 /*            4 -> 4            */
+5 2 0 8                 /*            5 -> 5            */
+6 2 3 8                 /*            6 -> 6            */
+7 3 0 8                 /*            7 -> 7            */
+8 3 3 8                 /*            8 -> 8            */
+9 4 0 8                 /*            9 -> 9            */
+10 4 3 8                /*            0 -> 0            */
+11 5 0 8                /*         Plus -> Plus         */
+12 5 3 8                /*            \xB4 -> Minus        */
+13 6 3 8                /*            \ -> CLR/HOME     */
+#14 -1 -1 0             /*              -> (no key)     */
+#15 -1 -1 0             /*     KEYPAD 0 -> (no key)     */
+16 7 6 8                /*            Q -> Q            */
+17 1 1 8                /*            W -> W            */
+18 1 6 8                /*            E -> E            */
+19 2 1 8                /*            R -> R            */
+20 2 6 8                /*            T -> T            */
+21 3 1 8                /*            Y -> Y            */
+22 3 6 8                /*            U -> U            */
+23 4 1 8                /*            I -> I            */
+24 4 6 8                /*            O -> O            */
+25 5 1 8                /*            P -> P            */
+26 5 6 8                /*        (\xE5) [ -> @            */
+27 6 1 8                /*        (\xA8) ] -> *            */
+#28 -1 -1 0             /*              -> (no key)     */
+#29 -1 -1 0             /*     KEYPAD 1 -> (no key)     */
+#30 -1 -1 0             /*     KEYPAD 2 -> (no key)     */
+#31 -1 -1 0             /*     KEYPAD 3 -> (no key)     */
+32 1 2 8                /*            A -> A            */
+33 1 5 8                /*            S -> S            */
+34 2 2 8                /*            D -> D            */
+35 2 5 8                /*            F -> F            */
+36 3 2 8                /*            G -> G            */
+37 3 5 8                /*            H -> H            */
+38 4 2 8                /*            J -> J            */
+39 4 5 8                /*            K -> K            */
+40 5 2 8                /*            L -> L            */
+41 5 5 8                /*            ; -> :            */
+42 6 2 8                /*            ' -> ;            */
+43 6 5 8                /*            \ -> =            */
+#44 -1 -1 0             /*              -> (no key)     */
+#45 -1 -1 0             /*     KEYPAD 4 -> (no key)     */
+#46 -1 -1 0             /*     KEYPAD 5 -> (no key)     */
+#47 -1 -1 0             /*     KEYPAD 6 -> (no key)     */
+48 6 5 8                /*            < -> =            */
+49 1 4 8                /*            Z -> Z            */
+50 2 7 8                /*            X -> X            */
+51 2 4 8                /*            C -> C            */
+52 3 7 8                /*            V -> V            */
+53 3 4 8                /*            B -> B            */
+54 4 7 8                /*            N -> N            */
+55 4 4 8                /*            M -> M            */
+56 5 7 8                /*            , -> ,            */
+57 5 4 8                /*            . -> .            */
+58 6 7 8                /*            / -> /            */
+#59 -1 -1 0             /*              -> (no key)     */
+#60 -1 -1 0             /*   KEYPAD DEL -> (no key)     */
+#61 -1 -1 0             /*     KEYPAD 7 -> (no key)     */
+#62 -1 -1 0             /*     KEYPAD 8 -> (no key)     */
+#63 -1 -1 0             /*     KEYPAD 9 -> (no key)     */
+64 7 4 8                /*        Space -> Space        */
+65 0 0 8                /*    Backspace -> Del          */
+66 7 2 8                /*          TAB -> Ctrl         */
+#67 -1 -1 0             /* KEYPAD ENTER -> (no key)     */
+68 0 1 8                /*       Return -> Return       */
+69 7 7 8                /*          ESC -> Run/Stop     */
+70 6 0 8                /*          DEL -> Pound        */
+#71 -1 -1 0             /*              -> (no key)     */
+#72 -1 -1 0             /*              -> (no key)     */
+#73 -1 -1 0             /*              -> (no key)     */
+#74 -1 -1 0             /*     KEYPAD - -> (no key)     */
+#75 -1 -1 0             /*              -> (no key)     */
+76 0 7 1                /*           Up -> CRSR UP      */
+77 0 7 8                /*         Down -> CRSR DOWN    */
+78 0 2 8                /*        Right -> CRSR RIGHT   */
+79 0 2 1                /*         Left -> CRSR LEFT    */
+80 0 4 8                /*           F1 -> F1           */
+81 0 4 1                /*           F2 -> F2           */
+82 0 5 8                /*           F3 -> F3           */
+83 0 5 1                /*           F4 -> F4           */
+84 0 6 8                /*           F5 -> F5           */
+85 0 6 1                /*           F6 -> F6           */
+86 0 3 8                /*           F7 -> F7           */
+87 0 3 1                /*           F8 -> F8           */
+#88 -1 -1 0             /*           F9 -> (no key)     */
+#89 -1 -1 0             /*          F10 -> (no key)     */
+#90 -1 -1 0             /*      NUMLOCK -> (no key)     */
+#91 -1 -1 0             /*      SCRLOCK -> (no key)     */
+#92 -1 -1 0             /* KEYPAD SLASH -> (no key)     */
+#93 -1 -1 0             /*     KEYPAD * -> (no key)     */
+#94 -1 -1 0             /*     KEYPAD + -> (no key)     */
+95 6 6 8                /*         HELP -> Up Arrow     */
+96 1 7 2                /*   Left Shift -> Left Shift   */
+97 6 4 4                /*  Right Shift -> Right Shift  */
+#98 -1 -1 0             /*     CAPSLOCK -> (no key)     */
+99 7 5 8                /*         Ctrl -> CBM          */
+#100 -1 -1 0            /*     LEFT ALT -> (no key)     */
+#101 -1 -1 0            /*    RIGHT ALT -> (no key)     */
+#102 -1 -1 0            /*   LEFT AMIGA -> (no key)     */
+#103 -1 -1 0            /*  RIGHT AMIGA -> (no key)     */
+
+# Restore key mappings
+89 -3 0                 /*          F10 -> RESTORE      */
+

Deleted: trunk/vice/data/C64DTV/amiga_sym.vkm
===================================================================
--- tags/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_sym.vkm	2008-08-10 17:31:35 UTC (rev 19117)
+++ trunk/vice/data/C64DTV/amiga_sym.vkm	2008-08-11 17:59:29 UTC (rev 19118)
@@ -1,146 +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 7 1 8                 /*            ` -> Left Arrow   */
-1 7 0 8                 /*            1 -> 1            */
-2 7 3 8                 /*            2 -> 2            */
-3 1 0 8                 /*            3 -> 3            */
-4 1 3 8                 /*            4 -> 4            */
-5 2 0 8                 /*            5 -> 5            */
-6 2 3 8                 /*            6 -> 6            */
-7 3 0 8                 /*            7 -> 7            */
-8 3 3 8                 /*            8 -> 8            */
-9 4 0 8                 /*            9 -> 9            */
-10 4 3 8                /*            0 -> 0            */
-11 5 0 8                /*         Plus -> Plus         */
-12 5 3 8                /*            \xB4 -> Minus        */
-13 6 3 8                /*            \ -> CLR/HOME     */
-#14 -1 -1 0             /*              -> (no key)     */
-#15 -1 -1 0             /*     KEYPAD 0 -> (no key)     */
-16 7 6 8                /*            Q -> Q            */
-17 1 1 8                /*            W -> W            */
-18 1 6 8                /*            E -> E            */
-19 2 1 8                /*            R -> R            */
-20 2 6 8                /*            T -> T            */
-21 3 1 8                /*            Y -> Y            */
-22 3 6 8                /*            U -> U            */
-23 4 1 8                /*            I -> I            */
-24 4 6 8                /*            O -> O            */
-25 5 1 8                /*            P -> P            */
-26 5 6 8                /*        (\xE5) [ -> @            */
-27 6 1 8                /*        (\xA8) ] -> *            */
-#28 -1 -1 0             /*              -> (no key)     */
-#29 -1 -1 0             /*     KEYPAD 1 -> (no key)     */
-#30 -1 -1 0             /*     KEYPAD 2 -> (no key)     */
-#31 -1 -1 0             /*     KEYPAD 3 -> (no key)     */
-32 1 2 8                /*            A -> A            */
-33 1 5 8                /*            S -> S            */
-34 2 2 8                /*            D -> D            */
-35 2 5 8                /*            F -> F            */
-36 3 2 8                /*            G -> G            */
-37 3 5 8                /*            H -> H            */
-38 4 2 8                /*            J -> J            */
-39 4 5 8                /*            K -> K            */
-40 5 2 8                /*            L -> L            */
-41 5 5 8                /*            ; -> :            */
-42 6 2 8                /*            ' -> ;            */
-43 6 5 8                /*            \ -> =            */
-#44 -1 -1 0             /*              -> (no key)     */
-#45 -1 -1 0             /*     KEYPAD 4 -> (no key)     */
-#46 -1 -1 0             /*     KEYPAD 5 -> (no key)     */
-#47 -1 -1 0             /*     KEYPAD 6 -> (no key)     */
-48 6 5 8                /*            < -> =            */
-49 1 4 8                /*            Z -> Z            */
-50 2 7 8                /*            X -> X            */
-51 2 4 8                /*            C -> C            */
-52 3 7 8                /*            V -> V            */
-53 3 4 8                /*            B -> B            */
-54 4 7 8                /*            N -> N            */
-55 4 4 8                /*            M -> M            */
-56 5 7 8                /*            , -> ,            */
-57 5 4 8                /*            . -> .            */
-58 6 7 8                /*            / -> /            */
-#59 -1 -1 0             /*              -> (no key)     */
-#60 -1 -1 0             /*   KEYPAD DEL -> (no key)     */
-#61 -1 -1 0             /*     KEYPAD 7 -> (no key)     */
-#62 -1 -1 0             /*     KEYPAD 8 -> (no key)     */
-#63 -1 -1 0             /*     KEYPAD 9 -> (no key)     */
-64 7 4 8                /*        Space -> Space        */
-65 0 0 8                /*    Backspace -> Del          */
-66 7 2 8                /*          TAB -> Ctrl         */
-#67 -1 -1 0             /* KEYPAD ENTER -> (no key)     */
-68 0 1 8                /*       Return -> Return       */
-69 7 7 8                /*          ESC -> Run/Stop     */
-70 6 0 8                /*          DEL -> Pound        */
-#71 -1 -1 0             /*              -> (no key)     */
-#72 -1 -1 0             /*              -> (no key)     */
-#73 -1 -1 0             /*              -> (no key)     */
-#74 -1 -1 0             /*     KEYPAD - -> (no key)     */
-#75 -1 -1 0             /*              -> (no key)     */
-76 0 7 1                /*           Up -> CRSR UP      */
-77 0 7 8                /*         Down -> CRSR DOWN    */
-78 0 2 8                /*        Right -> CRSR RIGHT   */
-79 0 2 1                /*         Left -> CRSR LEFT    */
-80 0 4 8                /*           F1 -> F1           */
-81 0 4 1                /*           F2 -> F2           */
-82 0 5 8                /*           F3 -> F3           */
-83 0 5 1                /*           F4 -> F4           */
-84 0 6 8                /*           F5 -> F5           */
-85 0 6 1                /*           F6 -> F6           */
-86 0 3 8                /*           F7 -> F7           */
-87 0 3 1                /*           F8 -> F8           */
-#88 -1 -1 0             /*           F9 -> (no key)     */
-#89 -1 -1 0             /*          F10 -> (no key)     */
-#90 -1 -1 0             /*      NUMLOCK -> (no key)     */
-#91 -1 -1 0             /*      SCRLOCK -> (no key)     */
-#92 -1 -1 0             /* KEYPAD SLASH -> (no key)     */
-#93 -1 -1 0             /*     KEYPAD * -> (no key)     */
-#94 -1 -1 0             /*     KEYPAD + -> (no key)     */
-95 6 6 8                /*         HELP -> Up Arrow     */
-96 1 7 2                /*   Left Shift -> Left Shift   */
-97 6 4 4                /*  Right Shift -> Right Shift  */
-#98 -1 -1 0             /*     CAPSLOCK -> (no key)     */
-99 7 5 8                /*         Ctrl -> CBM          */
-#100 -1 -1 0            /*     LEFT ALT -> (no key)     */
-#101 -1 -1 0            /*    RIGHT ALT -> (no key)     */
-#102 -1 -1 0            /*   LEFT AMIGA -> (no key)     */
-#103 -1 -1 0            /*  RIGHT AMIGA -> (no key)     */
-
-# Restore key mappings
-89 -3 0                 /*          F10 -> RESTORE      */
-

Copied: trunk/vice/data/C64DTV/amiga_sym.vkm (from rev 19117, tags/viceplus/v2.0-x64dtv/vice/data/C64DTV/amiga_sym.vkm)
===================================================================
--- trunk/vice/data/C64DTV/amiga_sym.vkm	                        (rev 0)
+++ trunk/vice/data/C64DTV/amiga_sym.vkm	2008-08-11 17:59:29 UTC (rev 19118)
@@ -0,0 +1,146 @@
+# 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 7 1 8                 /*            ` -> Left Arrow   */
+1 7 0 8                 /*            1 -> 1            */
+2 7 3 8                 /*            2 -> 2            */
+3 1 0 8                 /*            3 -> 3            */
+4 1 3 8                 /*            4 -> 4            */
+5 2 0 8                 /*            5 -> 5            */
+6 2 3 8                 /*            6 -> 6            */
+7 3 0 8                 /*            7 -> 7            */
+8 3 3 8                 /*            8 -> 8            */
+9 4 0 8                 /*            9 -> 9            */
+10 4 3 8                /*            0 -> 0            */
+11 5 0 8                /*         Plus -> Plus         */
+12 5 3 8                /*            \xB4 -> Minus        */
+13 6 3 8                /*            \ -> CLR/HOME     */
+#14 -1 -1 0             /*              -> (no key)     */
+#15 -1 -1 0             /*     KEYPAD 0 -> (no key)     */
+16 7 6 8                /*            Q -> Q            */
+17 1 1 8                /*            W -> W            */
+18 1 6 8                /*            E -> E            */
+19 2 1 8                /*            R -> R            */
+20 2 6 8                /*            T -> T            */
+21 3 1 8                /*            Y -> Y            */
+22 3 6 8                /*            U -> U            */
+23 4 1 8                /*            I -> I            */
+24 4 6 8                /*            O -> O            */
+25 5 1 8                /*            P -> P            */
+26 5 6 8                /*        (\xE5) [ -> @            */
+27 6 1 8                /*        (\xA8) ] -> *            */
+#28 -1 -1 0             /*              -> (no key)     */
+#29 -1 -1 0             /*     KEYPAD 1 -> (no key)     */
+#30 -1 -1 0             /*     KEYPAD 2 -> (no key)     */
+#31 -1 -1 0             /*     KEYPAD 3 -> (no key)     */
+32 1 2 8                /*            A -> A            */
+33 1 5 8                /*            S -> S            */
+34 2 2 8                /*            D -> D            */
+35 2 5 8                /*            F -> F            */
+36 3 2 8                /*            G -> G            */
+37 3 5 8                /*            H -> H            */
+38 4 2 8                /*            J -> J            */
+39 4 5 8                /*            K -> K            */
+40 5 2 8                /*            L -> L            */
+41 5 5 8                /*            ; -> :            */
+42 6 2 8                /*            ' -> ;            */
+43 6 5 8                /*            \ -> =            */
+#44 -1 -1 0             /*              -> (no key)     */
+#45 -1 -1 0             /*     KEYPAD 4 -> (no key)     */
+#46 -1 -1 0             /*     KEYPAD 5 -> (no key)     */
+#47 -1 -1 0             /*     KEYPAD 6 -> (no key)     */
+48 6 5 8                /*            < -> =            */
+49 1 4 8                /*            Z -> Z            */
+50 2 7 8                /*            X -> X            */
+51 2 4 8                /*            C -> C            */
+52 3 7 8                /*            V -> V            */
+53 3 4 8                /*            B -> B            */
+54 4 7 8                /*            N -> N            */
+55 4 4 8                /*            M -> M            */
+56 5 7 8                /*            , -> ,            */
+57 5 4 8                /*            . -> .            */
+58 6 7 8                /*            / -> /            */
+#59 -1 -1 0             /*              -> (no key)     */
+#60 -1 -1 0             /*   KEYPAD DEL -> (no key)     */
+#61 -1 -1 0             /*     KEYPAD 7 -> (no key)     */
+#62 -1 -1 0             /*     KEYPAD 8 -> (no key)     */
+#63 -1 -1 0             /*     KEYPAD 9 -> (no key)     */
+64 7 4 8                /*        Space -> Space        */
+65 0 0 8                /*    Backspace -> Del          */
+66 7 2 8                /*          TAB -> Ctrl         */
+#67 -1 -1 0             /* KEYPAD ENTER -> (no key)     */
+68 0 1 8                /*       Return -> Return       */
+69 7 7 8                /*          ESC -> Run/Stop     */
+70 6 0 8                /*          DEL -> Pound        */
+#71 -1 -1 0             /*              -> (no key)     */
+#72 -1 -1 0             /*              -> (no key)     */
+#73 -1 -1 0             /*              -> (no key)     */
+#74 -1 -1 0             /*     KEYPAD - -> (no key)     */
+#75 -1 -1 0             /*              -> (no key)     */
+76 0 7 1                /*           Up -> CRSR UP      */
+77 0 7 8                /*         Down -> CRSR DOWN    */
+78 0 2 8                /*        Right -> CRSR RIGHT   */
+79 0 2 1                /*         Left -> CRSR LEFT    */
+80 0 4 8                /*           F1 -> F1           */
+81 0 4 1                /*           F2 -> F2           */
+82 0 5 8                /*           F3 -> F3           */
+83 0 5 1                /*           F4 -> F4           */
+84 0 6 8                /*           F5 -> F5           */
+85 0 6 1                /*           F6 -> F6           */
+86 0 3 8                /*           F7 -> F7           */
+87 0 3 1                /*           F8 -> F8           */
+#88 -1 -1 0             /*           F9 -> (no key)     */
+#89 -1 -1 0             /*          F10 -> (no key)     */
+#90 -1 -1 0             /*      NUMLOCK -> (no key)     */
+#91 -1 -1 0             /*      SCRLOCK -> (no key)     */
+#92 -1 -1 0             /* KEYPAD SLASH -> (no key)     */
+#93 -1 -1 0             /*     KEYPAD * -> (no key)     */
+#94 -1 -1 0             /*     KEYPAD + -> (no key)     */
+95 6 6 8                /*         HELP -> Up Arrow     */
+96 1 7 2                /*   Left Shift -> Left Shift   */
+97 6 4 4                /*  Right Shift -> Right Shift  */
+#98 -1 -1 0             /*     CAPSLOCK -> (no key)     */
+99 7 5 8                /*         Ctrl -> CBM          */
+#100 -1 -1 0            /*     LEFT ALT -> (no key)     */
+#101 -1 -1 0            /*    RIGHT ALT -> (no key)     */
+#102 -1 -1 0            /*   LEFT AMIGA -> (no key)     */
+#103 -1 -1 0            /*  RIGHT AMIGA -> (no key)     */
+
+# Restore key mappings
+89 -3 0                 /*          F10 -> RESTORE      */
+

Deleted: trunk/vice/data/C64DTV/beos_pos.vkm
===================================================================
--- tags/viceplus/v2.0-x64dtv/vice/data/C64DTV/beos_pos.vkm	2008-08-10 17:31:35 UTC (rev 19117)
+++ trunk/vice/data/C64DTV/beos_pos.vkm	2008-08-11 17:59:29 UTC (rev 19118)
@@ -1,177 +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/scancode
-# 1      key is shifted for this keysym/scancode
-# 2      left shift
-# 4      right shift
-# 8      key can be shifted or not with this keysym/scancode
-# 16     deshift key for this keysym/scancode
-# 32     another definition for this keysym/scancode follows
-#
-# 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 -1 0          /*           (no key)           */
-1 7 7 8             /*          ESC -> Run/Stop     */
-2 0 4 8             /*           F1 -> F1           */
-3 0 4 1             /*           F2 -> F2           */
-4 0 5 8             /*           F3 -> F3           */
-5 0 5 1             /*           F4 -> F4           */
-6 0 6 8             /*           F5 -> F5           */
-7 0 6 1             /*           F6 -> F6           */
-8 0 3 8             /*           F7 -> F7           */
-9 0 3 1             /*           F8 -> F8           */
-#10 -1 -1 0         /*           F9 -> (no key)     */
-#11 -1 -1 0         /*          F10 -> (no key)     */
-#12 -1 -1 0         /*          F11 -> (no key)     */
...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu:[19117] branches/fabrizio/v1.22.13-newjoydesign/vice

From: <fa...@us...> - 2008-08-10 17:33:25

Revision: 19117
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19117&view=rev
Author:   fabbo
Date:     2008-08-10 17:31:35 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
Integrate 2.0

Modified Paths:
--------------
    branches/fabrizio/v1.22.13-newjoydesign/vice/AUTHORS
    branches/fabrizio/v1.22.13-newjoydesign/vice/ChangeLog
    branches/fabrizio/v1.22.13-newjoydesign/vice/Makefile.am
    branches/fabrizio/v1.22.13-newjoydesign/vice/README
    branches/fabrizio/v1.22.13-newjoydesign/vice/build/Makefile.am
    branches/fabrizio/v1.22.13-newjoydesign/vice/build/qnx4/build.sh
    branches/fabrizio/v1.22.13-newjoydesign/vice/build/riscos/build-cross.sh
    branches/fabrizio/v1.22.13-newjoydesign/vice/config.guess
    branches/fabrizio/v1.22.13-newjoydesign/vice/config.sub
    branches/fabrizio/v1.22.13-newjoydesign/vice/configure.in
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/C128/win_shortcuts.vsc
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/C64/Makefile.am
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/C64/osx_pos.vkm
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/C64/win_shortcuts.vsc
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/CBM-II/win_shortcuts.vsc
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/PET/win_shortcuts.vsc
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/PLUS4/win_shortcuts.vsc
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/VIC20/win_shortcuts.vsc
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/Makefile.am
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/Readme.beos
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/ReadmeMacOSX.txt
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/Win32-Cygwin-HOWTO.txt
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/Makefile.am
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/amigaos.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/beos.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/index.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/macosx.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/plain/BUGS
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/plain/NEWS
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/solaris.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_1.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_10.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_11.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_12.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_13.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_14.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_15.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_16.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_2.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_3.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_4.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_5.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_6.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_7.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_8.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_9.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/vice_toc.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/vice.info
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/vice.texi
    branches/fabrizio/v1.22.13-newjoydesign/vice/po/ChangeLog
    branches/fabrizio/v1.22.13-newjoydesign/vice/po/POTFILES.in
    branches/fabrizio/v1.22.13-newjoydesign/vice/po/de.po
    branches/fabrizio/v1.22.13-newjoydesign/vice/po/fr.po
    branches/fabrizio/v1.22.13-newjoydesign/vice/po/hu.po
    branches/fabrizio/v1.22.13-newjoydesign/vice/po/intl2po.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/po/it.po
    branches/fabrizio/v1.22.13-newjoydesign/vice/po/nl.po
    branches/fabrizio/v1.22.13-newjoydesign/vice/po/pl.po
    branches/fabrizio/v1.22.13-newjoydesign/vice/po/sv.po
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/6510core.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/ChangeLog
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/Makefile.am
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/alarm.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/README.AMIGA
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/c128uires.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/c64uires.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/catweaselmkiii.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/cbm2uires.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/intl.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/intl.txt
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/joyai.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/make-bindist.sh
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/mui/mui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/mui/mui.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/mui/uisnapshot.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/mui/uivideoc128.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/mui/uivideoc64plus4vic20.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/petuires.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/plus4uires.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/private.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/screen-shot.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/uiapi.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/uic64cart.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/uires.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/vic20uires.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/video.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/Makefile.am
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/archdep.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/blockdev.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/c64ui.cc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/console.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/constants.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/joy.cc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/kbd.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/kbd.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/make-bindist.sh
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/ui.cc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/ui_device.cc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/ui_file.cc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/ui_ram.cc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/ui_sid.cc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/ui_sound.cc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/ui_vicii.cc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/ui_video.cc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/uimon.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/vicemenu.cc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/vicewindow.cc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/cbm2ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/console.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/make-bindist.sh
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/menudefs.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/petui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/plus4ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/uic64cart.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/uijoystick.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/uinetplay.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/uiperipherial.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/video.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/archdep.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/blockdev.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/dialogs.rc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/dlg-cmdopt.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/dlg-color.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/dlg-color.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/dlg-color.rc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/dlg-drive.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/dlg-fileio.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/dlg-joystick.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/dlg-monitor.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/menubar.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/menubar.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/menubar.rc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/fullscr.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/kbd/parse.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/uimon.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/vac++/incl/c64cart.icc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/vac++/incl/mainsrc.icc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/video.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/vsidui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/watcom/c64cart.tgt
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/watcom/mainsrc.tgt
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/watcom/vice.wpj
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/riscos/spritedrv.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/riscos/ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/riscos/video.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/riscos/videoarch.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/archdep.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/archdep.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/coproc.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/audio_gp2x.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/c128ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/c64ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/cbm2ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/input_gp2x.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/input_gp2x.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/make-bindist.sh
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/minimal.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/petui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/plus4ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/prefs_gp2x.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/uiarch.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/vic20ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/video.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/vkeyboard_gp2x.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/vsidui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/c128ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/c64ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/cbm2ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/uic64cart.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/uipalemu.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/uitfe.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/uivicii.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/uivicii.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/vsidui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Info.plist
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Makefile.am
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/Credits.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/Makefile.am
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/console.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.am
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/fullscreen.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/kbd.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/kbd.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/main.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/menu/c64controller.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/menu/c64controller.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/menu/c64machinecontroller.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/uimon.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/viceapplication.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/viceapplication.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/vicemachine.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/vicemachine.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/video.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/videoarch.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/view/consolewindow.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/view/fullscreenwindow.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/view/joystickview.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/view/keypressview.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/view/viceglview.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/view/viceglview.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/view/vicewindow.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/make-bindist.sh
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/mousedrv.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/qnx6/make-bindist.sh
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/readline/complete.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/readline/editline.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/readline/editline.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/readline/editline2.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/readline/sysunix.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/rs232.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/sco_sol/make-bindist.sh
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/signals.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/tfearch.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/vsyncarch.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/gnome/about.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/gnome/uicolor.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/gnome/uipalcontrol.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/gnome/x11ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/qnxshm.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/renderxv.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/xaw/about.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/xaw/widgets/FileSel.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/xaw/widgets/MultiList.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/xaw/widgets/TextField.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/xaw/x11ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/xaw/x11video.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/Makefile.am
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/archdep.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/base.dsp
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/c128ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/c64cart.dsp
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ffmpeglib.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/fullscrn.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/intl.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/intl.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/kbd.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/res.rc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/resc128.rc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/resc64.rc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/rescbm2.rc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/resdialogs.txt
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/resgeoram.rc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/reside64.rc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/resmenu.txt
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/resmouse.rc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/respet.rc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/resplus4.rc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/resstrings.txt
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/resvic20.rc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/signals.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/statusbar.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uiacia.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uiattach.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uic128.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uic64_256k.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uic64cart.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uicart.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uicbm2set.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uicmdline.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uiconsole.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uidrivec128.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uidrivec64.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uidrivepetcbm2.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uidriveplus4.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uidrivevic20.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uievent.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uifliplist.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uigeoram.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uihelp.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uiide64.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uijoystick.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uikeyboard.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uilib.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uimediafile.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uimon.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uinetwork.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uiperipheral.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uipetreu.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uipetset.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uiplus256k.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uiplus4cart.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uiplus60k.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uiquicksnapshot.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uiramcart.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uireu.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uirom.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uirs232user.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uisid.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uisnapshot.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uisound.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/uivideo.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/utils/genwinres.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/vice.dsw
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/watcom/base.tgt
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/watcom/c64.tgt
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/watcom/c64cart.tgt
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/watcom/monitor.tgt
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/watcom/plus4.tgt
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/watcom/vic20.tgt
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/watcom/vice.wpj
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/autostart.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/autostart.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c128/c128-cmdline-options.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c128/c128-resources.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c128/c128mem.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c128/c128rom.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c128/c128rom.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c1541.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/c64-resources.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/c64io.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/c64io.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/c64keyboard.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/c64mem.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/c64rom.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/c64rom.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/cart/Makefile.am
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/cart/c64cart.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/cart/c64cartmem.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/cart/crt.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/digimax.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/georam.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/georam.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/mmc64.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/patchrom.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/ramcart.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/reu.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/tfe.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/cartconv.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/cartridge.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/cbm2/cbm2mem.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/cbmimage.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/crtc/crtc.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/rotation.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/fsdevice/fsdevice-close.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/fsdevice/fsdevice-open.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/gfxoutput.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/gfxoutputdrv/bmpdrv.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/gfxoutputdrv/ffmpegdrv.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/gfxoutputdrv/gifdrv.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/gfxoutputdrv/iffdrv.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/gfxoutputdrv/jpegdrv.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/gfxoutputdrv/pcxdrv.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/gfxoutputdrv/pngdrv.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/gfxoutputdrv/ppmdrv.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/info.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/init.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/initcmdline.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/joystick.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/keyboard.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/lib.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/lib.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/main.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/maincpu.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/mem.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/mon_assemble6502.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/mon_assemblez80.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/mon_command.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/mon_file.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/mon_file.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/mon_lex.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/mon_lex.l
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/mon_memory.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/mon_parse.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/mon_parse.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/mon_parse.y
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/monitor.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/montypes.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/network.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/pet/petmem.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/pet/petsound.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/plus4/plus4mem.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/plus4/ted-mem.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/plus4/ted-sound.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/raster/raster-sprite-status.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/raster/raster-sprite-status.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/raster/raster-sprite.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/raster/raster-sprite.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/resources.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/screenshot.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/screenshot.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sid/sid-resources.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sound.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sound.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sounddrv/soundallegro.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sounddrv/soundarts.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sounddrv/soundbeos.cc
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sounddrv/soundhpux.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sounddrv/soundmmos2.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sounddrv/soundmp3.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sounddrv/soundsun.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sounddrv/soundvoc.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sounddrv/soundwav.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sounddrv/soundwmm.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/tape/tape.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/translate.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/translate.txt
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/util.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vdrive/vdrive-bam.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vdrive/vdrive-bam.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vdrive/vdrive-command.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vdrive/vdrive-internal.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/version.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vic20/vic-mem.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vic20/vic20cartridge.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vic20/vic20mem.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vic20/vic20sound.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vicii/vicii-badline.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vicii/vicii-cmdline-options.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vicii/vicii-draw.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vicii/vicii-fetch.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vicii/vicii-fetch.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vicii/vicii-mem.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vicii/vicii-sprites.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vicii/vicii-sprites.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vicii/vicii.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/video/render2x2.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/video/render2x2.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/video/render2x2pal.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/video/render2x2pal.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/video/video-color.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/video/video-render-pal.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/video/video-resources-pal.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/video/video-resources.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/video/video-resources.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/video.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/zfile.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/vice.spec

Added Paths:
-----------
    branches/fabrizio/v1.22.13-newjoydesign/vice/Doxyfile
    branches/fabrizio/v1.22.13-newjoydesign/vice/build/macosx/build-vice-release.sh
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/C64/osx_sym_de.vkm
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/C64/osx_sym_us.vkm
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/GP2X-Howto.txt
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/hpux.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/qnx.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/sco.html
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceTree.plist
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/VICE.icns
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/cartridge.icns
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/floppy525.icns
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/tape.icns
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/x128.icns
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/x64.icns
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/x65.icns
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/xcbm2.icns
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/xpet.icns
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/xplus4.icns
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/xvic.icns
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/VICE.xcodeproj/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/iecdrivesettingswindowcontroller.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/iecdrivesettingswindowcontroller.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/printersettingswindowcontroller.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/printersettingswindowcontroller.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/soundsettingswindowcontroller.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/soundsettingswindowcontroller.m
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/_vice.dsp
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/make-msvc-bindist.bat
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/watcom/make-watcom-bindist.bat
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/cart/actionreplay4.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/cart/actionreplay4.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/cart/stardos.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/cart/stardos.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/clipboard.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/clipboard.h
    branches/fabrizio/v1.22.13-newjoydesign/vice/vice-mint.spec

Removed Paths:
-------------
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/C64/osx_sym.vkm
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/classes.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/info.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/keyedobjects.nib
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/vice.dsp

Property Changed:
----------------
    branches/fabrizio/v1.22.13-newjoydesign/vice/
    branches/fabrizio/v1.22.13-newjoydesign/vice/build/
    branches/fabrizio/v1.22.13-newjoydesign/vice/build/mingw32/
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/C128/
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/C64/
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/CBM-II/
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/DRIVES/
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/PET/
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/PLUS4/
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/PRINTER/
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/VIC20/
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/
    branches/fabrizio/v1.22.13-newjoydesign/vice/data/fonts/vice-cbm.bdf
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/
    branches/fabrizio/v1.22.13-newjoydesign/vice/doc/html/
    branches/fabrizio/v1.22.13-newjoydesign/vice/man/
    branches/fabrizio/v1.22.13-newjoydesign/vice/po/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/amigaos/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/beos/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/msdos/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/dialogs/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/kbd/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/snippets/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/os2/vac++/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/riscos/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gp2x/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/gui/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/Resources/English.lproj/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/dialog/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/menu/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/macosx/cocoa/view/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/readline/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/gnome/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/xaw/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/unix/x11/xaw/widgets/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/msvc/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/utils/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c128/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/c64/cart/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/cbm2/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/core/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/crtc/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/diskimage/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iec/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iec/c64exp/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iec/plus4exp/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iec128dcr/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/iecieee/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/ieee/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/drive/tcbm/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/fileio/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/fsdevice/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/gfxoutputdrv/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/iecbus/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/imagecontents/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/lib/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/lib/lpng/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/lib/zlib/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/monitor/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/parallel/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/pet/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/plus4/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/printerdrv/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/raster/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/resid/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/rs232drv/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/serial/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sid/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/sounddrv/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/tape/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vdc/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vdrive/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vic20/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/vicii/
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/video/


Property changes on: branches/fabrizio/v1.22.13-newjoydesign/vice
___________________________________________________________________
Added: svn:ignore
   + aclocal.m4
.aclocal.out
.autoconf.out
.autoheader.out
autom4te.cache
.automake.out
config.log
config.status
config.status.lineno
configure
depcomp
Makefile
Makefile.in
missing

Added: svn:mergeinfo
   + /tags/v2.0/v2.0/vice:19052-19116
/trunk/vice:18752-19051

Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/AUTHORS
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/AUTHORS	2008-08-10 01:32:49 UTC (rev 19116)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/AUTHORS	2008-08-10 17:31:35 UTC (rev 19117)
@@ -14,3 +14,4 @@
 Teemu Rantanen <tv...@cs...>
 Marco van den Heuvel <bla...@ya...>
 Christian Vogelgsang <ch...@vo...>
+Fabrizio Gennari <fab...@ti...>

Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/ChangeLog
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/ChangeLog	2008-08-10 01:32:49 UTC (rev 19116)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/ChangeLog	2008-08-10 17:31:35 UTC (rev 19117)
@@ -1,3 +1,204 @@
+2008-07-18  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 2.0
+
+2008-07-18  Christian Vogelgsang  <ch...@vo...>
+
+	* build/macosx/build-vice-release.sh: use provided autogen.sh
+
+	* doc/ReadmeMacOSX.txt: updated mac docs
+
+	* doc/html/macosx.html: Prepared for release of 2.0
+
+2008-07-17  Spiro Trikaliotis  <spi...@gm...>
+
+	* doc/vice.texi, doc/html/plain/NEWS, doc/html/index.html,
+	doc/Win32-Cygwin-HOWTO.txt: Prepared for upcoming 2.0 release.
+
+2008-07-16  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.27
+
+2008-07-15  Marco van den Heuvel  <bla...@ya...>
+
+	* Makefile.am: Reverted the skyos make bindist(zip) part back to
+	what is used to be.
+
+2008-07-14  Marco van den Heuvel  <bla...@ya...>
+
+	* README: Updated for the 2.0 release.
+
+2008-07-13  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.26
+
+2008-07-12  Marco van den Heuvel  <bla...@ya...>
+
+	* build/riscos/build-cross.sh: Added a missing 'cd ..'.
+
+	* configure.in: Corrected a typo.
+
+	* doc/Readme.beos: Updated.
+
+	* vice-mint.spec, vice.spec: Release version updated to 2.0.
+
+2008-07-10  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.25
+
+2008-07-07  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.24
+
+2008-07-07  Marco van den Heuvel  <bla...@ya...>
+
+	* doc/html/plain/NEWS: Updated.
+
+2008-07-04  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.23
+
+2008-07-04  Spiro Trikaliotis  <spi...@gm...>
+
+	* Makefile.am: Make sure the file Doxyfile is included in the
+	distribution.
+
+	* doc/html/Makefile.am: Make sure the files hpux.html and
+	sco.html are included in the distribution.
+
+2008-07-01  Marco van den Heuvel  <bla...@ya...>
+
+	* doc/GP2X-Howto.txt, doc/Makefile.am: Added a GP2X compile
+	howto text file.
+
+2008-07-02  Andreas Matthies  <and...@gm...>
+
+	* doc/html/plain/BUGS, NEWS: Updated.
+
+2008-07-01  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.22
+
+2008-06-30  Marco van den Heuvel  <bla...@ya...>
+
+	* doc/html/plain/NEWS: Added mint and sol11 ports and corrected
+	a typo.
+
+	* doc/html/solaris.html: Added sol11 port.
+
+2008-06-29  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.21
+
+2008-06-28  Spiro Trikaliotis  <spi...@gm...>
+
+	* data/CBM-II/win_shortcuts.vsc, data/VIC20/win_shortcuts.vsc,
+	data/PLUS4/win_shortcuts.vsc, data/PET/win_shortcuts.vsc,
+	data/C64/win_shortcuts.vsc, data/C128/win_shortcuts.vsc: Set
+	default shortcuts Ctrl+C and Ctrl+V for Edit/Copy and Edit/Paste
+
+	* doc/html/plain/NEWS: Updated
+
+2008-06-23  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.20
+
+2008-06-23  Spiro Trikaliotis  <spi...@gm...>
+
+	* vice-mint.spec: Added (was forgotten in the previous version)
+
+2008-06-22  Marco van den Heuvel  <bla...@ya...>
+
+	* Makefile.am: Improved some of the make-bindist.sh scripts.
+
+2008-06-19  Marco van den Heuvel  <bla...@ya...>
+
+	* vice-mint.spec, Makefile.am: Added Atari Mint specific rpm
+
+2008-06-19  Marco van den Heuvel  <bla...@ya...>
+
+	* vice-mint.spec, Makefile.am: Added Atari Mint specific rpm
+	spec file.
+
+	* AUTHORS, README: Added Fabrizio to the VICE core members.
+
+	* config.guess, config.sub: Added preliminary support for
+	avr32-linux.
+
+	* doc/vice.texi: Added Fabrizio to the VICE core members, got
+	rid of a duplicate Christian Vogelgsang entry and added/updated
+	external contributors entries.
+
+	* doc/html/plain/NEWS, doc/html/index.html: Updated for the
+	VICE 2.0 release.
+
+2008-06-22  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.19
+
+2008-06-17  Spiro Trikaliotis  <spi...@gm...>
+
+	* Doxyfile: new file to allow to auto-generate doxygen
+	documentation.
+
+2008-06-15  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.18
+
+2008-06-08  Marco van den Heuvel  <bla...@ya...>
+
+	* configure.in: Added a check for the minix version for the
+	prototypes of recv and send in network.c.
+
+	* doc/html/solaris.html, doc/html/amigaos.html,
+	doc/html/sco.html, doc/html/hpux.html, doc/html/beos.html,
+	doc/html/qnx.html, doc/html/Makefile.am, doc/html/index.html:
+	Updated for the upcoming 2.0 release.
+
+2008-06-03  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.17.
+
+	* configure.in: Test for libnet 1.1 and set VICE_USE_LIBNET_1_1
+	if it exists. This adds support for libnet 1.1 for TFE/RR-net
+	emulation.
+
+2008-06-03  Spiro Trikaliotis  <spi...@gm...>
+
+	* configure.in: Changed bash'ism (if [...]) to more general code
+	(if test ...).
+
+2008-06-01  Marco van den Heuvel  <bla...@ya...>
+
+	* configure.in: Added extra defines needed for minix, alligned
+	the printout of configure and added the --enable-memmap
+	configure option for the memmap feature from VICEplus as
+	provided by Hannu Nuotio <han...@tu...>.
+
+	* build/qnx4/build.sh: Fixed the qnx 4.x build script.
+
+2008-05-25  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.16.
+
+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-24  Marco van den Heuvel  <bla...@ya...>
+
+	* Makefile.am: Added a '@' in front of the 'make install' echo.
+
 2008-05-19  Spiro Trikaliotis  <spi...@gm...>
 
 	* autogen.sh: Removed "bash-ism" from script (compare with "=="
@@ -38,6 +239,15 @@
 
 	* Version 1.22.14.
 
+2008-05-01  Marco van den Heuvel  <bla...@ya...>
+
+	* configure.in, data/fonts/vice-cbm.bdf,
+	data/fonts/Makefile.am: Added a check for the 'fc-cache'
+	command, and use the .bdf font if not present.
+
+	* doc/html/Makefile.am, doc/Makefile.am: Fixed the
+	ALTERNATE_DOCDIR problems with automake.
+
 2008-04-27  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.13.

Copied: branches/fabrizio/v1.22.13-newjoydesign/vice/Doxyfile (from rev 19051, trunk/vice/Doxyfile)
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/Doxyfile	                        (rev 0)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/Doxyfile	2008-08-10 17:31:35 UTC (rev 19117)
@@ -0,0 +1,1163 @@
+# Doxyfile 1.3.9.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = VICE
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = .doxygen/
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of source 
+# files, where putting all generated files in the same directory would otherwise 
+# cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
+# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
+# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
+# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
+# Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# This tag can be used to specify the encoding used in the generated output. 
+# The encoding is not always determined by the language that is chosen, 
+# but also whether or not the output is meant for Windows or non-Windows users. 
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
+# force...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu:[19116] trunk/vice/src/arch/os2/video.c

From: <bla...@us...> - 2008-08-10 01:32:41

Revision: 19116
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19116&view=rev
Author:   blackystardust
Date:     2008-08-10 01:32:49 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
Added fix for the OS/2 24/32 bit color depth issue, as provided by 'doodle'.

Modified Paths:
--------------
    trunk/vice/src/arch/os2/video.c

Modified: trunk/vice/src/arch/os2/video.c
===================================================================
--- trunk/vice/src/arch/os2/video.c	2008-08-10 01:20:20 UTC (rev 19115)
+++ trunk/vice/src/arch/os2/video.c	2008-08-10 01:32:49 UTC (rev 19116)
@@ -681,10 +681,20 @@
                 divecaps.fScreenDirect?", Direct access supported":"",
                 divecaps.fBankSwitched?", Bank switch required":"");
 
+    // As DIVE does not support conversion between RGB and BGR formats,
+    // we have to match the source FCC with the desktop FCC
+    if (divecaps.fccColorEncoding==FOURCC_BGR4 ||
+        divecaps.fccColorEncoding==FOURCC_BGR3)
+    {
+        divecaps.fccColorEncoding=FOURCC_BGR3;
+    } else
+    if (divecaps.fccColorEncoding==FOURCC_RGB4 ||
+        divecaps.fccColorEncoding==FOURCC_RGB3)
+    {
+        divecaps.fccColorEncoding=FOURCC_RGB3;
+    } else
     if (divecaps.fccColorEncoding!=FOURCC_LUT8 &&
-        divecaps.fccColorEncoding!=FOURCC_R565 &&
-        divecaps.fccColorEncoding!=FOURCC_RGB3 &&
-        divecaps.fccColorEncoding!=FOURCC_RGB4)
+        divecaps.fccColorEncoding!=FOURCC_R565)
         divecaps.fccColorEncoding = FOURCC_RGB3;
 
     rc = divecaps.fccColorEncoding;
@@ -734,7 +744,7 @@
     case FOURCC_R555:
     case FOURCC_R664: return 16;
     case FOURCC_RGB3:
-    case FOURCC_BGR3:// return 24;
+    case FOURCC_BGR3: return 24;
     case FOURCC_RGB4:
     case FOURCC_BGR4: return 32;
     }
@@ -751,7 +761,7 @@
     case FOURCC_RGB3:
     case FOURCC_RGB4: return n<<16;
     case FOURCC_BGR3:
-    case FOURCC_BGR4: return n<<16;
+    case FOURCC_BGR4: return n;
     }
     return 0;
 }
@@ -781,7 +791,7 @@
     case FOURCC_RGB3:
     case FOURCC_RGB4: return n;
     case FOURCC_BGR3:
-    case FOURCC_BGR4: return n;
+    case FOURCC_BGR4: return n<<16;
     }
     return 0;
 }
@@ -2027,6 +2037,7 @@
 
     ULONG ulTrg=0;
     ULONG ulSrc=0;
+    FOURCC fccSrc = FOURCC_RGB3;
 
     char target[0x400]; // max: 256*4b
     char source[0x400]; // max: 256*4b
@@ -2040,11 +2051,17 @@
         return;
     }
 
+    // As DIVE does not support conversion between RGB and BGR formats,
+    // we have to match the source FCC with the desktop FCC
+    if ((c->divesetup.fccSrcColorFormat==FOURCC_BGR3) ||
+        (c->divesetup.fccSrcColorFormat==FOURCC_BGR4))
+        fccSrc = FOURCC_BGR3;
+
     memset(&setup, 0, sizeof(SETUP_BLITTER));
 
     setup.ulStructLen          = sizeof(SETUP_BLITTER);
     setup.pVisDstRects         = calloc(1, sizeof(RECTL));
-    setup.fccSrcColorFormat    = FOURCC_RGB3;
+    setup.fccSrcColorFormat    = fccSrc;
     setup.fccDstColorFormat    = c->divesetup.fccSrcColorFormat;
     setup.ulSrcHeight          = 1;
     setup.ulDstHeight          = 1;
@@ -2061,7 +2078,7 @@
         return;
     }
 
-    rc=DiveAllocImageBuffer(inst, &ulSrc, FOURCC_RGB3, num, 1, 0, source);
+    rc=DiveAllocImageBuffer(inst, &ulSrc, fccSrc, num, 1, 0, source);
     if (rc)
         log_error(vidlog, "VideoConvertPalette - DiveAllocImageBuffer (src) failed, rc=0x%x", rc);
     else
@@ -2073,11 +2090,22 @@
         else
         {
             int i;
-            for (i=0; i<num; i++)
+            if (fccSrc == FOURCC_RGB3)
             {
-                source[i*3]   = src[i].red;
-                source[i*3+1] = src[i].green;
-                source[i*3+2] = src[i].blue;
+                for (i=0; i<num; i++)
+                {
+                    source[i*3]   = src[i].red;
+                    source[i*3+1] = src[i].green;
+                    source[i*3+2] = src[i].blue;
+                }
+            } else
+            {
+                for (i=0; i<num; i++)
+                {
+                    source[i*3]   = src[i].blue;
+                    source[i*3+1] = src[i].green;
+                    source[i*3+2] = src[i].red;
+                }
             }
 
             rc = DiveSetupBlitter(inst, &setup);
@@ -2218,3 +2246,4 @@
 {
     cap_fullscreen->device_num = 0;
 }
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19115] trunk/vice/src/vice.h

From: <bla...@us...> - 2008-08-10 01:20:14

Revision: 19115
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19115&view=rev
Author:   blackystardust
Date:     2008-08-10 01:20:20 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
Fixed GP2X black screen issue.

Modified Paths:
--------------
    trunk/vice/src/vice.h

Modified: trunk/vice/src/vice.h
===================================================================
--- trunk/vice/src/vice.h	2008-08-06 21:23:22 UTC (rev 19114)
+++ trunk/vice/src/vice.h	2008-08-10 01:20:20 UTC (rev 19115)
@@ -55,7 +55,7 @@
  * cpu        4*u_char fetch   1*u_int32 fetch   define(s)
  * -----      --------------   ---------------   ---------
  * alpha          faster           slower        __alpha__
- * arm (gp2x)     slower           faster        GP2X
+ * arm (gp2x)     slower (*)       faster (*)    GP2X
  * ppc            slower           faster        __powerpc__ || __ppc__
  * x86            slower           faster        __i386__
  * m68020+        slower           faster        __m680[2346]0__
@@ -79,11 +79,6 @@
 #define ALLOW_UNALIGNED_ACCESS
 #endif
 
-/* Allow unaligned access for gp2x port */
-#ifdef GP2X
-#define ALLOW_UNALIGNED_ACCESS
-#endif
-
 /* Allow unaligned access for m68020+ based platforms */
 #if defined(__m68020__) || defined(__m68030__) || defined(__m68040__) || defined(__m68060__)
 #define ALLOW_UNALIGNED_ACCESS


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19114] branches/fabrizio/v1.22.13-newjoydesign/vice/ src/arch/win32/ui.c

From: <fa...@us...> - 2008-08-06 21:23:13

Revision: 19114
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19114&view=rev
Author:   fabbo
Date:     2008-08-06 21:23:22 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
Forgot one variable

Modified Paths:
--------------
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c

Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c	2008-08-06 21:16:34 UTC (rev 19113)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c	2008-08-06 21:23:22 UTC (rev 19114)
@@ -89,7 +89,7 @@
 
 
 extern char *intl_speed_at_text;
-extern int _mouse_x, _mouse_y;
+extern int _mouse_x, _mouse_y, _mouse_enabled;
 
 #define countof(array) (sizeof(array) / sizeof((array)[0]))
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19113] branches/fabrizio/v1.22.13-newjoydesign/vice/ src/arch/win32/ui.c

From: <fa...@us...> - 2008-08-06 21:16:24

Revision: 19113
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19113&view=rev
Author:   fabbo
Date:     2008-08-06 21:16:34 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
Last touches to non-DirectInput mouse driver

Modified Paths:
--------------
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c

Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c	2008-08-05 20:34:47 UTC (rev 19112)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c	2008-08-06 21:16:34 UTC (rev 19113)
@@ -1485,9 +1485,21 @@
         statusbar_notify(window, window_index, wparam, lparam);
         break;
       case WM_MOUSEMOVE:
-        _mouse_x =  lparam        & 0xFF;
-        _mouse_y = (lparam >> 16) & 0xFF;
+        _mouse_x =  (lparam        & 0xFFFF)*4;
+        _mouse_y = ((lparam >> 16) & 0xFFFF)*4;
         break;
+      case WM_LBUTTONDOWN:
+        if (_mouse_enabled) mouse_button_left(1);
+        break;
+      case WM_RBUTTONDOWN:
+        if (_mouse_enabled) mouse_button_right(1);
+        break;
+      case WM_LBUTTONUP:
+        if (_mouse_enabled) mouse_button_left(0);
+        break;
+      case WM_RBUTTONUP:
+        if (_mouse_enabled) mouse_button_right(0);
+        break;
     }
 
     return DefWindowProc(window, msg, wparam, lparam);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19112] branches/amatthies/current/vice

From: <ama...@us...> - 2008-08-05 20:34:45

Revision: 19112
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19112&view=rev
Author:   amatthies
Date:     2008-08-05 20:34:47 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
Fixed and improved win32 keyboard shortcuts (thanks iAN CooG).

Modified Paths:
--------------
    branches/amatthies/current/vice/data/C128/win_shortcuts.vsc
    branches/amatthies/current/vice/data/C64/win_shortcuts.vsc
    branches/amatthies/current/vice/data/CBM-II/win_shortcuts.vsc
    branches/amatthies/current/vice/data/PET/win_shortcuts.vsc
    branches/amatthies/current/vice/data/PLUS4/win_shortcuts.vsc
    branches/amatthies/current/vice/data/VIC20/win_shortcuts.vsc
    branches/amatthies/current/vice/src/arch/win32/resc128.rc
    branches/amatthies/current/vice/src/arch/win32/resc64.rc
    branches/amatthies/current/vice/src/arch/win32/rescbm2.rc
    branches/amatthies/current/vice/src/arch/win32/resdialogs.txt
    branches/amatthies/current/vice/src/arch/win32/respet.rc
    branches/amatthies/current/vice/src/arch/win32/resplus4.rc
    branches/amatthies/current/vice/src/arch/win32/resvic20.rc
    branches/amatthies/current/vice/src/arch/win32/ui.c
    branches/amatthies/current/vice/src/arch/win32/uikeyboard.c

Modified: branches/amatthies/current/vice/data/C128/win_shortcuts.vsc
===================================================================
--- branches/amatthies/current/vice/data/C128/win_shortcuts.vsc	2008-08-04 21:29:21 UTC (rev 19111)
+++ branches/amatthies/current/vice/data/C128/win_shortcuts.vsc	2008-08-05 20:34:47 UTC (rev 19112)
@@ -1,53 +1,153 @@
-
 #
 # VICE definition file for Keyboard Shortcuts in Win32
 #
-
-# Syntax
-# First column: Combination of ALT|CTRL to hold for the shortcut
+# Syntax:
+# First column: Combination of ALT|CTRL|SHIFT to or just KEY
 # Second column: (virtual) Keycode for the shortcut
 #   Code can be character ('X'), hex (0xAB) or decimal (168)
 #   Have a look at winuser.h for the list of virtual key codes (VK_..)
 # Third column: command identifier that is executed with the shortcut
-# Fourth column: text to display in the menu item; missing this lets 
+# Fourth column: text to display in the menu item; missing this lets
 #   the keycode char be displayed.
 
-CTRL|ALT    'R'         IDM_RESET_HARD
-ALT         'R'         IDM_RESET_SOFT
-ALT         '4'         IDM_FORMFEED_PRINTERIEC4
-ALT         '5'         IDM_FORMFEED_PRINTERIEC5
-ALT         '8'         IDM_ATTACH_8
-ALT         '9'         IDM_ATTACH_9
-ALT         '0'         IDM_ATTACH_10
-ALT         '1'         IDM_ATTACH_11
-ALT         'A'         IDM_DETACH_ALL
-ALT         'T'         IDM_ATTACH_TAPE
-ALT         'L'         IDM_LOADQUICK
-ALT         'S'         IDM_SAVEQUICK
-ALT         'M'         IDM_MONITOR
-ALT         'X'         IDM_EXIT
-ALT         'W'         IDM_TOGGLE_WARP_MODE
-ALT         'I'         IDM_FLIP_ADD
-ALT         'K'         IDM_FLIP_REMOVE
-ALT         'N'         IDM_FLIP_NEXT
-ALT         'B'         IDM_FLIP_PREVIOUS
-ALT         'J'         IDM_SWAP_JOYSTICK
-ALT         'C'         IDM_MEDIAFILE
-ALT         'G'         IDM_EVENT_SETMILESTONE
-ALT         'H'         IDM_EVENT_RESETMILESTONE
-ALT         'D'         IDM_TOGGLE_FULLSCREEN
-ALT         13          IDM_TOGGLE_FULLSCREEN               # VK_RETURN
-ALT         0x13        IDM_PAUSE                   Pause   # VK_PAUSE
-ALT         0xBB        IDM_SINGLE_FRAME_ADVANCE    +       # VK_OEM_PLUS   0xBB
-ALT         0x6B        IDM_SINGLE_FRAME_ADVANCE            # VK_ADD        0x6B
+CTRL|ALT        'R'         IDM_RESET_HARD                    R
+ALT             'R'         IDM_RESET_SOFT                    R
+ALT             '4'         IDM_FORMFEED_PRINTERIEC4          4
+ALT             '5'         IDM_FORMFEED_PRINTERIEC5          5
+ALT             '8'         IDM_ATTACH_8                      8
+ALT             '9'         IDM_ATTACH_9                      9
+ALT             '0'         IDM_ATTACH_10                     0
+ALT             '1'         IDM_ATTACH_11                     1
+ALT             'A'         IDM_DETACH_ALL                    A
+ALT             'T'         IDM_ATTACH_TAPE                   T
+ALT             'L'         IDM_LOADQUICK                     L
+ALT             'S'         IDM_SAVEQUICK                     S
+ALT             'M'         IDM_MONITOR                       M
+ALT             'X'         IDM_EXIT                          X
+ALT             'W'         IDM_TOGGLE_WARP_MODE              W
+ALT             'I'         IDM_FLIP_ADD                      I
+ALT             'K'         IDM_FLIP_REMOVE                   K
+ALT             'N'         IDM_FLIP_NEXT                     N
+ALT             'B'         IDM_FLIP_PREVIOUS                 B
+ALT             'J'         IDM_SWAP_JOYSTICK                 J
+ALT             'C'         IDM_MEDIAFILE                     C
+ALT             'G'         IDM_EVENT_SETMILESTONE            G
+ALT             'H'         IDM_EVENT_RESETMILESTONE          H
+ALT             'D'         IDM_TOGGLE_FULLSCREEN             D
+ALT             0x0D        IDM_TOGGLE_FULLSCREEN             D
+ALT             0x13        IDM_PAUSE                         Pause
+ALT             0xBB        IDM_SINGLE_FRAME_ADVANCE          +
+ALT             0x6B        IDM_SINGLE_FRAME_ADVANCE          +
+ALT             'Z'         IDM_CART_FREEZE                   Z
+ALT             'Q'         IDM_MOUSE                         Q
+ALT             0x79        IDM_TOGGLE_MAINCPU_TRACE          F10
+ALT             0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE        F11
+ALT             0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE        F12
+CTRL            'C'         IDM_EDIT_COPY                     C
+CTRL            'V'         IDM_EDIT_PASTE                    V
+CTRL            0x2D        IDM_EDIT_COPY                     C
 
-ALT         'Z'         IDM_CART_FREEZE
-ALT         'Q'         IDM_MOUSE
-
-ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
-ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
-ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
-
-CTRL        'C'         IDM_EDIT_COPY
-CTRL        'V'         IDM_EDIT_PASTE
-CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT
+#
+# Other command identifier that can be used in shortcuts
+#
+# IDM_FILE_EXIT                           IDM_ABOUT
+# IDM_AUTOSTART                           IDM_RESET_DRIVE8
+# IDM_RESET_DRIVE9                        IDM_RESET_DRIVE10
+# IDM_RESET_DRIVE11                       IDM_DETACH_TAPE
+# IDM_DATASETTE_CONTROL                   IDM_DETACH_8
+# IDM_DETACH_9                            IDM_DETACH_10
+# IDM_DETACH_11                           IDM_TOGGLE_SOUND
+# IDM_TOGGLE_DOUBLESIZE                   IDM_TOGGLE_DOUBLESCAN
+# IDM_TOGGLE_DRIVE_TRUE_EMULATION         IDM_TOGGLE_VIDEOCACHE
+# IDM_DRIVE_SETTINGS                      IDM_CART_ATTACH_CRT
+# IDM_CART_ATTACH_8KB                     IDM_CART_ATTACH_16KB
+# IDM_CART_ATTACH_AR                      IDM_CART_ATTACH_AR3
+# IDM_CART_ATTACH_AR4                     IDM_CART_ATTACH_STARDOS
+# IDM_CART_ATTACH_AT                      IDM_CART_ATTACH_EPYX
+# IDM_CART_ATTACH_IEEE488                 IDM_CART_ATTACH_RR
+# IDM_CART_ATTACH_SS4                     IDM_CART_ATTACH_SS5
+# IDM_CART_ATTACH_IDE64                   IDM_CART_ATTACH_FUNCLO
+# IDM_CART_ATTACH_FUNCHI                  IDM_CART_ATTACH_C1LO
+# IDM_CART_ATTACH_C1HI                    IDM_CART_ATTACH_C2LO
+# IDM_CART_ATTACH_C2HI                    IDM_CART_ATTACH_STB
+# IDM_CART_SET_DEFAULT                    IDM_CART_DETACH
+# IDM_CART_VIC20_8KB_2000                 IDM_CART_VIC20_8KB_6000
+# IDM_CART_VIC20_8KB_A000                 IDM_CART_VIC20_4KB_B000
+# IDM_CART_VIC20_16KB                     IDM_CART_VIC20_16KB_4000
+# IDM_CART_ENABLE_EXPERT                  IDM_CART_MODE_OFF
+# IDM_CART_MODE_PRG                       IDM_CART_MODE_ON
+# IDM_TOGGLE_CART_RESET                   IDM_SNAPSHOT_LOAD
+# IDM_SNAPSHOT_SAVE                       IDM_EVENT_DIRECTORY
+# IDM_EVENT_TOGGLE_RECORD                 IDM_EVENT_TOGGLE_PLAYBACK
+# IDM_EVENT_START_MODE_SAVE               IDM_EVENT_START_MODE_LOAD
+# IDM_EVENT_START_MODE_RESET              IDM_EVENT_START_MODE_PLAYBACK
+# IDM_NETWORK_SETTINGS                    IDM_SETTINGS_SAVE
+# IDM_SETTINGS_LOAD                       IDM_SETTINGS_DEFAULT
+# IDM_DEVICEMANAGER                       IDM_REFRESH_RATE_AUTO
+# IDM_REFRESH_RATE_1                      IDM_REFRESH_RATE_2
+# IDM_REFRESH_RATE_3                      IDM_REFRESH_RATE_4
+# IDM_REFRESH_RATE_5                      IDM_REFRESH_RATE_6
+# IDM_REFRESH_RATE_7                      IDM_REFRESH_RATE_8
+# IDM_REFRESH_RATE_9                      IDM_REFRESH_RATE_10
+# IDM_REFRESH_RATE_CUSTOM                 IDM_MAXIMUM_SPEED_200
+# IDM_MAXIMUM_SPEED_100                   IDM_MAXIMUM_SPEED_50
+# IDM_MAXIMUM_SPEED_20                    IDM_MAXIMUM_SPEED_10
+# IDM_MAXIMUM_SPEED_NO_LIMIT              IDM_MAXIMUM_SPEED_CUSTOM
+# IDM_VICII_SETTINGS                      IDM_PET_SETTINGS
+# IDM_CBM2_SETTINGS                       IDM_SYNC_FACTOR_PAL
+# IDM_SYNC_FACTOR_NTSC                    IDM_SYNC_FACTOR_NTSCOLD
+# IDM_JOY_SETTINGS                        IDM_SOUND_SETTINGS
+# IDM_STATUS_WINDOW                       IDM_HELP
+# IDM_DATASETTE_CONTROL_START             IDM_DATASETTE_CONTROL_STOP
+# IDM_DATASETTE_CONTROL_FORWARD           IDM_DATASETTE_CONTROL_REWIND
+# IDM_DATASETTE_CONTROL_RECORD            IDM_DATASETTE_CONTROL_RESET
+# IDM_DATASETTE_RESET_COUNTER             IDM_FLIP_LOAD
+# IDM_FLIP_SAVE                           IDM_REU_SETTINGS
+# IDM_GEORAM_SETTINGS                     IDM_RAMCART_SETTINGS
+# IDM_MMC64_SETTINGS                      IDM_TOGGLE_CRTCDOUBLESIZE
+# IDM_TOGGLE_CRTCDOUBLESCAN               IDM_TOGGLE_CRTCVIDEOCACHE
+# IDM_TOGGLE_EMUID                        IDM_IEEE488
+# IDM_DATASETTE_SETTINGS                  IDM_TOGGLE_VDC64KB
+# IDM_TOGGLE_VDC_DOUBLESIZE               IDM_TOGGLE_VDC_DOUBLESCAN
+# IDM_VIC_SETTINGS                        IDM_TOGGLE_VIRTUAL_DEVICES
+# IDM_CONTRIBUTORS                        IDM_LICENSE
+# IDM_WARRANTY                            IDM_CMDLINE
+# IDM_FULLSCREEN_SETTINGS                 IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT
+# IDM_TOGGLE_ALWAYSONTOP                  IDM_TOGGLE_CONFIRM_ON_EXIT
+# IDM_SID_SETTINGS                        IDM_TOGGLE_IFUNCTIONROM
+# IDM_IFUNCTIONROM_NAME                   IDM_TOGGLE_EFUNCTIONROM
+# IDM_EFUNCTIONROM_NAME                   IDM_TOGGLE_FASTPAL
+# IDM_VIDEO_SETTINGS                      IDM_PLUS4_SETTINGS
+# IDM_RAM_SETTINGS                        IDM_TFE_SETTINGS
+# IDM_TOGGLE_SCALE2X                      IDM_CUSTOM_SPEED
+# IDM_PRINTER_SETTINGS                    IDM_C128_SETTINGS
+# IDM_FORMFEED_PRINTERUSERPORT            IDM_ROM_SETTINGS
+# IDM_IDE64_SETTINGS                      IDM_ACIA_SETTINGS
+# IDM_RS232USER_SETTINGS                  IDM_RS232_SETTINGS
+# IDM_KEYBOARD_SETTINGS                   IDM_MOUSE_SETTINGS
+# IDM_DEBUG_MODE_NORMAL                   IDM_DEBUG_MODE_SMALL
+# IDM_DEBUG_MODE_HISTORY                  IDM_DEBUG_MODE_AUTOPLAY
+# IDM_LANG_EN                             IDM_LANG_DE
+# IDM_LANG_FR                             IDM_LANG_HU
+# IDM_LANG_IT                             IDM_LANG_NL
+# IDM_LANG_PL                             IDM_LANG_SV
+# IDM_MON_OPEN                            IDM_MON_SAVE
+# IDM_MON_PRINT                           IDM_MON_STOP_DEBUG
+# IDM_MON_STOP_EXEC                       IDM_MON_CURRENT
+# IDM_MON_STEP_INTO                       IDM_MON_STEP_OVER
+# IDM_MON_SKIP_RETURN                     IDM_MON_GOTO_CURSOR
+# IDM_MON_EVAL                            IDM_MON_WND_EVAL
+# IDM_MON_WND_REG                         IDM_MON_WND_MEM
+# IDM_MON_WND_DIS                         IDM_MON_WND_CONSOLE
+# IDM_MON_COMPUTER                        IDM_MON_DRIVE8
+# IDM_MON_DRIVE9                          IDM_MON_HELP
+# IDM_MON_CASCADE                         IDM_MON_TILE_HORIZ
+# IDM_MON_TILE_VERT                       IDM_MON_ARRANGE_ICONS
+# IDM_MON_GOTO_PC                         IDM_MON_GOTO_ADDRESS
+# IDM_MON_SET_BP                          IDM_MON_UNSET_BP
+# IDM_MON_ENABLE_BP                       IDM_MON_DISABLE_BP
+# IDM_WNDCHILD                            IDM_PLUS60K_SETTINGS
+# IDM_PLUS256K_SETTINGS                   IDM_C64_256K_SETTINGS
+# IDM_PETREU_SETTINGS                     IDM_SIDCART_SETTINGS
+# IDM_DIGIMAX_SETTINGS                    IDM_SOUND_RECORD_START
+# IDM_SOUND_RECORD_STOP                   

Modified: branches/amatthies/current/vice/data/C64/win_shortcuts.vsc
===================================================================
--- branches/amatthies/current/vice/data/C64/win_shortcuts.vsc	2008-08-04 21:29:21 UTC (rev 19111)
+++ branches/amatthies/current/vice/data/C64/win_shortcuts.vsc	2008-08-05 20:34:47 UTC (rev 19112)
@@ -1,53 +1,153 @@
-
 #
 # VICE definition file for Keyboard Shortcuts in Win32
 #
-
-# Syntax
-# First column: Combination of ALT|CTRL to hold for the shortcut
+# Syntax:
+# First column: Combination of ALT|CTRL|SHIFT to or just KEY
 # Second column: (virtual) Keycode for the shortcut
 #   Code can be character ('X'), hex (0xAB) or decimal (168)
 #   Have a look at winuser.h for the list of virtual key codes (VK_..)
 # Third column: command identifier that is executed with the shortcut
-# Fourth column: text to display in the menu item; missing this lets 
+# Fourth column: text to display in the menu item; missing this lets
 #   the keycode char be displayed.
 
-CTRL|ALT    'R'         IDM_RESET_HARD
-ALT         'R'         IDM_RESET_SOFT
-ALT         '4'         IDM_FORMFEED_PRINTERIEC4
-ALT         '5'         IDM_FORMFEED_PRINTERIEC5
-ALT         '8'         IDM_ATTACH_8
-ALT         '9'         IDM_ATTACH_9
-ALT         '0'         IDM_ATTACH_10
-ALT         '1'         IDM_ATTACH_11
-ALT         'A'         IDM_DETACH_ALL
-ALT         'T'         IDM_ATTACH_TAPE
-ALT         'L'         IDM_LOADQUICK
-ALT         'S'         IDM_SAVEQUICK
-ALT         'M'         IDM_MONITOR
-ALT         'X'         IDM_EXIT
-ALT         'W'         IDM_TOGGLE_WARP_MODE
-ALT         'I'         IDM_FLIP_ADD
-ALT         'K'         IDM_FLIP_REMOVE
-ALT         'N'         IDM_FLIP_NEXT
-ALT         'B'         IDM_FLIP_PREVIOUS
-ALT         'J'         IDM_SWAP_JOYSTICK
-ALT         'C'         IDM_MEDIAFILE
-ALT         'G'         IDM_EVENT_SETMILESTONE
-ALT         'H'         IDM_EVENT_RESETMILESTONE
-ALT         'D'         IDM_TOGGLE_FULLSCREEN
-ALT         13          IDM_TOGGLE_FULLSCREEN               # VK_RETURN
-ALT         0x13        IDM_PAUSE                   Pause   # VK_PAUSE
-ALT         0xBB        IDM_SINGLE_FRAME_ADVANCE    +       # VK_OEM_PLUS   0xBB
-ALT         0x6B        IDM_SINGLE_FRAME_ADVANCE            # VK_ADD        0x6B
+CTRL|ALT        'R'         IDM_RESET_HARD                    R
+ALT             'R'         IDM_RESET_SOFT                    R
+ALT             '4'         IDM_FORMFEED_PRINTERIEC4          4
+ALT             '5'         IDM_FORMFEED_PRINTERIEC5          5
+ALT             '8'         IDM_ATTACH_8                      8
+ALT             '9'         IDM_ATTACH_9                      9
+ALT             '0'         IDM_ATTACH_10                     0
+ALT             '1'         IDM_ATTACH_11                     1
+ALT             'A'         IDM_DETACH_ALL                    A
+ALT             'T'         IDM_ATTACH_TAPE                   T
+ALT             'L'         IDM_LOADQUICK                     L
+ALT             'S'         IDM_SAVEQUICK                     S
+ALT             'M'         IDM_MONITOR                       M
+ALT             'X'         IDM_EXIT                          X
+ALT             'W'         IDM_TOGGLE_WARP_MODE              W
+ALT             'I'         IDM_FLIP_ADD                      I
+ALT             'K'         IDM_FLIP_REMOVE                   K
+ALT             'N'         IDM_FLIP_NEXT                     N
+ALT             'B'         IDM_FLIP_PREVIOUS                 B
+ALT             'J'         IDM_SWAP_JOYSTICK                 J
+ALT             'C'         IDM_MEDIAFILE                     C
+ALT             'G'         IDM_EVENT_SETMILESTONE            G
+ALT             'H'         IDM_EVENT_RESETMILESTONE          H
+ALT             'D'         IDM_TOGGLE_FULLSCREEN             D
+ALT             0x0D        IDM_TOGGLE_FULLSCREEN             D
+ALT             0x13        IDM_PAUSE                         Pause
+ALT             0xBB        IDM_SINGLE_FRAME_ADVANCE          +
+ALT             0x6B        IDM_SINGLE_FRAME_ADVANCE          +
+ALT             'Z'         IDM_CART_FREEZE                   Z
+ALT             'Q'         IDM_MOUSE                         Q
+ALT             0x79        IDM_TOGGLE_MAINCPU_TRACE          F10
+ALT             0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE        F11
+ALT             0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE        F12
+CTRL            'C'         IDM_EDIT_COPY                     C
+CTRL            'V'         IDM_EDIT_PASTE                    V
+CTRL            0x2D        IDM_EDIT_COPY                     C
 
-ALT         'Z'         IDM_CART_FREEZE
-ALT         'Q'         IDM_MOUSE
-
-ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
-ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
-ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
-
-CTRL        'C'         IDM_EDIT_COPY
-CTRL        'V'         IDM_EDIT_PASTE
-CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT
+#
+# Other command identifier that can be used in shortcuts
+#
+# IDM_FILE_EXIT                           IDM_ABOUT
+# IDM_AUTOSTART                           IDM_RESET_DRIVE8
+# IDM_RESET_DRIVE9                        IDM_RESET_DRIVE10
+# IDM_RESET_DRIVE11                       IDM_DETACH_TAPE
+# IDM_DATASETTE_CONTROL                   IDM_DETACH_8
+# IDM_DETACH_9                            IDM_DETACH_10
+# IDM_DETACH_11                           IDM_TOGGLE_SOUND
+# IDM_TOGGLE_DOUBLESIZE                   IDM_TOGGLE_DOUBLESCAN
+# IDM_TOGGLE_DRIVE_TRUE_EMULATION         IDM_TOGGLE_VIDEOCACHE
+# IDM_DRIVE_SETTINGS                      IDM_CART_ATTACH_CRT
+# IDM_CART_ATTACH_8KB                     IDM_CART_ATTACH_16KB
+# IDM_CART_ATTACH_AR                      IDM_CART_ATTACH_AR3
+# IDM_CART_ATTACH_AR4                     IDM_CART_ATTACH_STARDOS
+# IDM_CART_ATTACH_AT                      IDM_CART_ATTACH_EPYX
+# IDM_CART_ATTACH_IEEE488                 IDM_CART_ATTACH_RR
+# IDM_CART_ATTACH_SS4                     IDM_CART_ATTACH_SS5
+# IDM_CART_ATTACH_IDE64                   IDM_CART_ATTACH_FUNCLO
+# IDM_CART_ATTACH_FUNCHI                  IDM_CART_ATTACH_C1LO
+# IDM_CART_ATTACH_C1HI                    IDM_CART_ATTACH_C2LO
+# IDM_CART_ATTACH_C2HI                    IDM_CART_ATTACH_STB
+# IDM_CART_SET_DEFAULT                    IDM_CART_DETACH
+# IDM_CART_VIC20_8KB_2000                 IDM_CART_VIC20_8KB_6000
+# IDM_CART_VIC20_8KB_A000                 IDM_CART_VIC20_4KB_B000
+# IDM_CART_VIC20_16KB                     IDM_CART_VIC20_16KB_4000
+# IDM_CART_ENABLE_EXPERT                  IDM_CART_MODE_OFF
+# IDM_CART_MODE_PRG                       IDM_CART_MODE_ON
+# IDM_TOGGLE_CART_RESET                   IDM_SNAPSHOT_LOAD
+# IDM_SNAPSHOT_SAVE                       IDM_EVENT_DIRECTORY
+# IDM_EVENT_TOGGLE_RECORD                 IDM_EVENT_TOGGLE_PLAYBACK
+# IDM_EVENT_START_MODE_SAVE               IDM_EVENT_START_MODE_LOAD
+# IDM_EVENT_START_MODE_RESET              IDM_EVENT_START_MODE_PLAYBACK
+# IDM_NETWORK_SETTINGS                    IDM_SETTINGS_SAVE
+# IDM_SETTINGS_LOAD                       IDM_SETTINGS_DEFAULT
+# IDM_DEVICEMANAGER                       IDM_REFRESH_RATE_AUTO
+# IDM_REFRESH_RATE_1                      IDM_REFRESH_RATE_2
+# IDM_REFRESH_RATE_3                      IDM_REFRESH_RATE_4
+# IDM_REFRESH_RATE_5                      IDM_REFRESH_RATE_6
+# IDM_REFRESH_RATE_7                      IDM_REFRESH_RATE_8
+# IDM_REFRESH_RATE_9                      IDM_REFRESH_RATE_10
+# IDM_REFRESH_RATE_CUSTOM                 IDM_MAXIMUM_SPEED_200
+# IDM_MAXIMUM_SPEED_100                   IDM_MAXIMUM_SPEED_50
+# IDM_MAXIMUM_SPEED_20                    IDM_MAXIMUM_SPEED_10
+# IDM_MAXIMUM_SPEED_NO_LIMIT              IDM_MAXIMUM_SPEED_CUSTOM
+# IDM_VICII_SETTINGS                      IDM_PET_SETTINGS
+# IDM_CBM2_SETTINGS                       IDM_SYNC_FACTOR_PAL
+# IDM_SYNC_FACTOR_NTSC                    IDM_SYNC_FACTOR_NTSCOLD
+# IDM_JOY_SETTINGS                        IDM_SOUND_SETTINGS
+# IDM_STATUS_WINDOW                       IDM_HELP
+# IDM_DATASETTE_CONTROL_START             IDM_DATASETTE_CONTROL_STOP
+# IDM_DATASETTE_CONTROL_FORWARD           IDM_DATASETTE_CONTROL_REWIND
+# IDM_DATASETTE_CONTROL_RECORD            IDM_DATASETTE_CONTROL_RESET
+# IDM_DATASETTE_RESET_COUNTER             IDM_FLIP_LOAD
+# IDM_FLIP_SAVE                           IDM_REU_SETTINGS
+# IDM_GEORAM_SETTINGS                     IDM_RAMCART_SETTINGS
+# IDM_MMC64_SETTINGS                      IDM_TOGGLE_CRTCDOUBLESIZE
+# IDM_TOGGLE_CRTCDOUBLESCAN               IDM_TOGGLE_CRTCVIDEOCACHE
+# IDM_TOGGLE_EMUID                        IDM_IEEE488
+# IDM_DATASETTE_SETTINGS                  IDM_TOGGLE_VDC64KB
+# IDM_TOGGLE_VDC_DOUBLESIZE               IDM_TOGGLE_VDC_DOUBLESCAN
+# IDM_VIC_SETTINGS                        IDM_TOGGLE_VIRTUAL_DEVICES
+# IDM_CONTRIBUTORS                        IDM_LICENSE
+# IDM_WARRANTY                            IDM_CMDLINE
+# IDM_FULLSCREEN_SETTINGS                 IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT
+# IDM_TOGGLE_ALWAYSONTOP                  IDM_TOGGLE_CONFIRM_ON_EXIT
+# IDM_SID_SETTINGS                        IDM_TOGGLE_IFUNCTIONROM
+# IDM_IFUNCTIONROM_NAME                   IDM_TOGGLE_EFUNCTIONROM
+# IDM_EFUNCTIONROM_NAME                   IDM_TOGGLE_FASTPAL
+# IDM_VIDEO_SETTINGS                      IDM_PLUS4_SETTINGS
+# IDM_RAM_SETTINGS                        IDM_TFE_SETTINGS
+# IDM_TOGGLE_SCALE2X                      IDM_CUSTOM_SPEED
+# IDM_PRINTER_SETTINGS                    IDM_C128_SETTINGS
+# IDM_FORMFEED_PRINTERUSERPORT            IDM_ROM_SETTINGS
+# IDM_IDE64_SETTINGS                      IDM_ACIA_SETTINGS
+# IDM_RS232USER_SETTINGS                  IDM_RS232_SETTINGS
+# IDM_KEYBOARD_SETTINGS                   IDM_MOUSE_SETTINGS
+# IDM_DEBUG_MODE_NORMAL                   IDM_DEBUG_MODE_SMALL
+# IDM_DEBUG_MODE_HISTORY                  IDM_DEBUG_MODE_AUTOPLAY
+# IDM_LANG_EN                             IDM_LANG_DE
+# IDM_LANG_FR                             IDM_LANG_HU
+# IDM_LANG_IT                             IDM_LANG_NL
+# IDM_LANG_PL                             IDM_LANG_SV
+# IDM_MON_OPEN                            IDM_MON_SAVE
+# IDM_MON_PRINT                           IDM_MON_STOP_DEBUG
+# IDM_MON_STOP_EXEC                       IDM_MON_CURRENT
+# IDM_MON_STEP_INTO                       IDM_MON_STEP_OVER
+# IDM_MON_SKIP_RETURN                     IDM_MON_GOTO_CURSOR
+# IDM_MON_EVAL                            IDM_MON_WND_EVAL
+# IDM_MON_WND_REG                         IDM_MON_WND_MEM
+# IDM_MON_WND_DIS                         IDM_MON_WND_CONSOLE
+# IDM_MON_COMPUTER                        IDM_MON_DRIVE8
+# IDM_MON_DRIVE9                          IDM_MON_HELP
+# IDM_MON_CASCADE                         IDM_MON_TILE_HORIZ
+# IDM_MON_TILE_VERT                       IDM_MON_ARRANGE_ICONS
+# IDM_MON_GOTO_PC                         IDM_MON_GOTO_ADDRESS
+# IDM_MON_SET_BP                          IDM_MON_UNSET_BP
+# IDM_MON_ENABLE_BP                       IDM_MON_DISABLE_BP
+# IDM_WNDCHILD                            IDM_PLUS60K_SETTINGS
+# IDM_PLUS256K_SETTINGS                   IDM_C64_256K_SETTINGS
+# IDM_PETREU_SETTINGS                     IDM_SIDCART_SETTINGS
+# IDM_DIGIMAX_SETTINGS                    IDM_SOUND_RECORD_START
+# IDM_SOUND_RECORD_STOP                   

Modified: branches/amatthies/current/vice/data/CBM-II/win_shortcuts.vsc
===================================================================
--- branches/amatthies/current/vice/data/CBM-II/win_shortcuts.vsc	2008-08-04 21:29:21 UTC (rev 19111)
+++ branches/amatthies/current/vice/data/CBM-II/win_shortcuts.vsc	2008-08-05 20:34:47 UTC (rev 19112)
@@ -1,53 +1,153 @@
-
 #
 # VICE definition file for Keyboard Shortcuts in Win32
 #
-
-# Syntax
-# First column: Combination of ALT|CTRL to hold for the shortcut
+# Syntax:
+# First column: Combination of ALT|CTRL|SHIFT to or just KEY
 # Second column: (virtual) Keycode for the shortcut
 #   Code can be character ('X'), hex (0xAB) or decimal (168)
 #   Have a look at winuser.h for the list of virtual key codes (VK_..)
 # Third column: command identifier that is executed with the shortcut
-# Fourth column: text to display in the menu item; missing this lets 
+# Fourth column: text to display in the menu item; missing this lets
 #   the keycode char be displayed.
 
-CTRL|ALT    'R'         IDM_RESET_HARD
-ALT         'R'         IDM_RESET_SOFT
-ALT         '4'         IDM_FORMFEED_PRINTERIEC4
-ALT         '5'         IDM_FORMFEED_PRINTERIEC5
-ALT         '8'         IDM_ATTACH_8
-ALT         '9'         IDM_ATTACH_9
-ALT         '0'         IDM_ATTACH_10
-ALT         '1'         IDM_ATTACH_11
-ALT         'A'         IDM_DETACH_ALL
-ALT         'T'         IDM_ATTACH_TAPE
-ALT         'L'         IDM_LOADQUICK
-ALT         'S'         IDM_SAVEQUICK
-ALT         'M'         IDM_MONITOR
-ALT         'X'         IDM_EXIT
-ALT         'W'         IDM_TOGGLE_WARP_MODE
-ALT         'I'         IDM_FLIP_ADD
-ALT         'K'         IDM_FLIP_REMOVE
-ALT         'N'         IDM_FLIP_NEXT
-ALT         'B'         IDM_FLIP_PREVIOUS
-ALT         'J'         IDM_SWAP_JOYSTICK
-ALT         'C'         IDM_MEDIAFILE
-ALT         'G'         IDM_EVENT_SETMILESTONE
-ALT         'H'         IDM_EVENT_RESETMILESTONE
-ALT         'D'         IDM_TOGGLE_FULLSCREEN
-ALT         13          IDM_TOGGLE_FULLSCREEN               # VK_RETURN
-ALT         0x13        IDM_PAUSE                   Pause   # VK_PAUSE
-ALT         0xBB        IDM_SINGLE_FRAME_ADVANCE    +       # VK_OEM_PLUS   0xBB
-ALT         0x6B        IDM_SINGLE_FRAME_ADVANCE            # VK_ADD        0x6B
+CTRL|ALT        'R'         IDM_RESET_HARD                    R
+ALT             'R'         IDM_RESET_SOFT                    R
+ALT             '4'         IDM_FORMFEED_PRINTERIEC4          4
+ALT             '5'         IDM_FORMFEED_PRINTERIEC5          5
+ALT             '8'         IDM_ATTACH_8                      8
+ALT             '9'         IDM_ATTACH_9                      9
+ALT             '0'         IDM_ATTACH_10                     0
+ALT             '1'         IDM_ATTACH_11                     1
+ALT             'A'         IDM_DETACH_ALL                    A
+ALT             'T'         IDM_ATTACH_TAPE                   T
+ALT             'L'         IDM_LOADQUICK                     L
+ALT             'S'         IDM_SAVEQUICK                     S
+ALT             'M'         IDM_MONITOR                       M
+ALT             'X'         IDM_EXIT                          X
+ALT             'W'         IDM_TOGGLE_WARP_MODE              W
+ALT             'I'         IDM_FLIP_ADD                      I
+ALT             'K'         IDM_FLIP_REMOVE                   K
+ALT             'N'         IDM_FLIP_NEXT                     N
+ALT             'B'         IDM_FLIP_PREVIOUS                 B
+ALT             'J'         IDM_SWAP_JOYSTICK                 J
+ALT             'C'         IDM_MEDIAFILE                     C
+ALT             'G'         IDM_EVENT_SETMILESTONE            G
+ALT             'H'         IDM_EVENT_RESETMILESTONE          H
+ALT             'D'         IDM_TOGGLE_FULLSCREEN             D
+ALT             0x0D        IDM_TOGGLE_FULLSCREEN             D
+ALT             0x13        IDM_PAUSE                         Pause
+ALT             0xBB        IDM_SINGLE_FRAME_ADVANCE          +
+ALT             0x6B        IDM_SINGLE_FRAME_ADVANCE          +
+ALT             'Z'         IDM_CART_FREEZE                   Z
+ALT             'Q'         IDM_MOUSE                         Q
+ALT             0x79        IDM_TOGGLE_MAINCPU_TRACE          F10
+ALT             0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE        F11
+ALT             0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE        F12
+CTRL            'C'         IDM_EDIT_COPY                     C
+CTRL            'V'         IDM_EDIT_PASTE                    V
+CTRL            0x2D        IDM_EDIT_COPY                     C
 
-ALT         'Z'         IDM_CART_FREEZE
-ALT         'Q'         IDM_MOUSE
-
-ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
-ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
-ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
-
-CTRL        'C'         IDM_EDIT_COPY
-CTRL        'V'         IDM_EDIT_PASTE
-CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT
+#
+# Other command identifier that can be used in shortcuts
+#
+# IDM_FILE_EXIT                           IDM_ABOUT
+# IDM_AUTOSTART                           IDM_RESET_DRIVE8
+# IDM_RESET_DRIVE9                        IDM_RESET_DRIVE10
+# IDM_RESET_DRIVE11                       IDM_DETACH_TAPE
+# IDM_DATASETTE_CONTROL                   IDM_DETACH_8
+# IDM_DETACH_9                            IDM_DETACH_10
+# IDM_DETACH_11                           IDM_TOGGLE_SOUND
+# IDM_TOGGLE_DOUBLESIZE                   IDM_TOGGLE_DOUBLESCAN
+# IDM_TOGGLE_DRIVE_TRUE_EMULATION         IDM_TOGGLE_VIDEOCACHE
+# IDM_DRIVE_SETTINGS                      IDM_CART_ATTACH_CRT
+# IDM_CART_ATTACH_8KB                     IDM_CART_ATTACH_16KB
+# IDM_CART_ATTACH_AR                      IDM_CART_ATTACH_AR3
+# IDM_CART_ATTACH_AR4                     IDM_CART_ATTACH_STARDOS
+# IDM_CART_ATTACH_AT                      IDM_CART_ATTACH_EPYX
+# IDM_CART_ATTACH_IEEE488                 IDM_CART_ATTACH_RR
+# IDM_CART_ATTACH_SS4                     IDM_CART_ATTACH_SS5
+# IDM_CART_ATTACH_IDE64                   IDM_CART_ATTACH_FUNCLO
+# IDM_CART_ATTACH_FUNCHI                  IDM_CART_ATTACH_C1LO
+# IDM_CART_ATTACH_C1HI                    IDM_CART_ATTACH_C2LO
+# IDM_CART_ATTACH_C2HI                    IDM_CART_ATTACH_STB
+# IDM_CART_SET_DEFAULT                    IDM_CART_DETACH
+# IDM_CART_VIC20_8KB_2000                 IDM_CART_VIC20_8KB_6000
+# IDM_CART_VIC20_8KB_A000                 IDM_CART_VIC20_4KB_B000
+# IDM_CART_VIC20_16KB                     IDM_CART_VIC20_16KB_4000
+# IDM_CART_ENABLE_EXPERT                  IDM_CART_MODE_OFF
+# IDM_CART_MODE_PRG                       IDM_CART_MODE_ON
+# IDM_TOGGLE_CART_RESET                   IDM_SNAPSHOT_LOAD
+# IDM_SNAPSHOT_SAVE                       IDM_EVENT_DIRECTORY
+# IDM_EVENT_TOGGLE_RECORD                 IDM_EVENT_TOGGLE_PLAYBACK
+# IDM_EVENT_START_MODE_SAVE               IDM_EVENT_START_MODE_LOAD
+# IDM_EVENT_START_MODE_RESET              IDM_EVENT_START_MODE_PLAYBACK
+# IDM_NETWORK_SETTINGS                    IDM_SETTINGS_SAVE
+# IDM_SETTINGS_LOAD                       IDM_SETTINGS_DEFAULT
+# IDM_DEVICEMANAGER                       IDM_REFRESH_RATE_AUTO
+# IDM_REFRESH_RATE_1                      IDM_REFRESH_RATE_2
+# IDM_REFRESH_RATE_3                      IDM_REFRESH_RATE_4
+# IDM_REFRESH_RATE_5                      IDM_REFRESH_RATE_6
+# IDM_REFRESH_RATE_7                      IDM_REFRESH_RATE_8
+# IDM_REFRESH_RATE_9                      IDM_REFRESH_RATE_10
+# IDM_REFRESH_RATE_CUSTOM                 IDM_MAXIMUM_SPEED_200
+# IDM_MAXIMUM_SPEED_100                   IDM_MAXIMUM_SPEED_50
+# IDM_MAXIMUM_SPEED_20                    IDM_MAXIMUM_SPEED_10
+# IDM_MAXIMUM_SPEED_NO_LIMIT              IDM_MAXIMUM_SPEED_CUSTOM
+# IDM_VICII_SETTINGS                      IDM_PET_SETTINGS
+# IDM_CBM2_SETTINGS                       IDM_SYNC_FACTOR_PAL
+# IDM_SYNC_FACTOR_NTSC                    IDM_SYNC_FACTOR_NTSCOLD
+# IDM_JOY_SETTINGS                        IDM_SOUND_SETTINGS
+# IDM_STATUS_WINDOW                       IDM_HELP
+# IDM_DATASETTE_CONTROL_START             IDM_DATASETTE_CONTROL_STOP
+# IDM_DATASETTE_CONTROL_FORWARD           IDM_DATASETTE_CONTROL_REWIND
+# IDM_DATASETTE_CONTROL_RECORD            IDM_DATASETTE_CONTROL_RESET
+# IDM_DATASETTE_RESET_COUNTER             IDM_FLIP_LOAD
+# IDM_FLIP_SAVE                           IDM_REU_SETTINGS
+# IDM_GEORAM_SETTINGS                     IDM_RAMCART_SETTINGS
+# IDM_MMC64_SETTINGS                      IDM_TOGGLE_CRTCDOUBLESIZE
+# IDM_TOGGLE_CRTCDOUBLESCAN               IDM_TOGGLE_CRTCVIDEOCACHE
+# IDM_TOGGLE_EMUID                        IDM_IEEE488
+# IDM_DATASETTE_SETTINGS                  IDM_TOGGLE_VDC64KB
+# IDM_TOGGLE_VDC_DOUBLESIZE               IDM_TOGGLE_VDC_DOUBLESCAN
+# IDM_VIC_SETTINGS                        IDM_TOGGLE_VIRTUAL_DEVICES
+# IDM_CONTRIBUTORS                        IDM_LICENSE
+# IDM_WARRANTY                            IDM_CMDLINE
+# IDM_FULLSCREEN_SETTINGS                 IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT
+# IDM_TOGGLE_ALWAYSONTOP                  IDM_TOGGLE_CONFIRM_ON_EXIT
+# IDM_SID_SETTINGS                        IDM_TOGGLE_IFUNCTIONROM
+# IDM_IFUNCTIONROM_NAME                   IDM_TOGGLE_EFUNCTIONROM
+# IDM_EFUNCTIONROM_NAME                   IDM_TOGGLE_FASTPAL
+# IDM_VIDEO_SETTINGS                      IDM_PLUS4_SETTINGS
+# IDM_RAM_SETTINGS                        IDM_TFE_SETTINGS
+# IDM_TOGGLE_SCALE2X                      IDM_CUSTOM_SPEED
+# IDM_PRINTER_SETTINGS                    IDM_C128_SETTINGS
+# IDM_FORMFEED_PRINTERUSERPORT            IDM_ROM_SETTINGS
+# IDM_IDE64_SETTINGS                      IDM_ACIA_SETTINGS
+# IDM_RS232USER_SETTINGS                  IDM_RS232_SETTINGS
+# IDM_KEYBOARD_SETTINGS                   IDM_MOUSE_SETTINGS
+# IDM_DEBUG_MODE_NORMAL                   IDM_DEBUG_MODE_SMALL
+# IDM_DEBUG_MODE_HISTORY                  IDM_DEBUG_MODE_AUTOPLAY
+# IDM_LANG_EN                             IDM_LANG_DE
+# IDM_LANG_FR                             IDM_LANG_HU
+# IDM_LANG_IT                             IDM_LANG_NL
+# IDM_LANG_PL                             IDM_LANG_SV
+# IDM_MON_OPEN                            IDM_MON_SAVE
+# IDM_MON_PRINT                           IDM_MON_STOP_DEBUG
+# IDM_MON_STOP_EXEC                       IDM_MON_CURRENT
+# IDM_MON_STEP_INTO                       IDM_MON_STEP_OVER
+# IDM_MON_SKIP_RETURN                     IDM_MON_GOTO_CURSOR
+# IDM_MON_EVAL                            IDM_MON_WND_EVAL
+# IDM_MON_WND_REG                         IDM_MON_WND_MEM
+# IDM_MON_WND_DIS                         IDM_MON_WND_CONSOLE
+# IDM_MON_COMPUTER                        IDM_MON_DRIVE8
+# IDM_MON_DRIVE9                          IDM_MON_HELP
+# IDM_MON_CASCADE                         IDM_MON_TILE_HORIZ
+# IDM_MON_TILE_VERT                       IDM_MON_ARRANGE_ICONS
+# IDM_MON_GOTO_PC                         IDM_MON_GOTO_ADDRESS
+# IDM_MON_SET_BP                          IDM_MON_UNSET_BP
+# IDM_MON_ENABLE_BP                       IDM_MON_DISABLE_BP
+# IDM_WNDCHILD                            IDM_PLUS60K_SETTINGS
+# IDM_PLUS256K_SETTINGS                   IDM_C64_256K_SETTINGS
+# IDM_PETREU_SETTINGS                     IDM_SIDCART_SETTINGS
+# IDM_DIGIMAX_SETTINGS                    IDM_SOUND_RECORD_START
+# IDM_SOUND_RECORD_STOP                   

Modified: branches/amatthies/current/vice/data/PET/win_shortcuts.vsc
===================================================================
--- branches/amatthies/current/vice/data/PET/win_shortcuts.vsc	2008-08-04 21:29:21 UTC (rev 19111)
+++ branches/amatthies/current/vice/data/PET/win_shortcuts.vsc	2008-08-05 20:34:47 UTC (rev 19112)
@@ -1,53 +1,153 @@
-
 #
 # VICE definition file for Keyboard Shortcuts in Win32
 #
-
-# Syntax
-# First column: Combination of ALT|CTRL to hold for the shortcut
+# Syntax:
+# First column: Combination of ALT|CTRL|SHIFT to or just KEY
 # Second column: (virtual) Keycode for the shortcut
 #   Code can be character ('X'), hex (0xAB) or decimal (168)
 #   Have a look at winuser.h for the list of virtual key codes (VK_..)
 # Third column: command identifier that is executed with the shortcut
-# Fourth column: text to display in the menu item; missing this lets 
+# Fourth column: text to display in the menu item; missing this lets
 #   the keycode char be displayed.
 
-CTRL|ALT    'R'         IDM_RESET_HARD
-ALT         'R'         IDM_RESET_SOFT
-ALT         '4'         IDM_FORMFEED_PRINTERIEC4
-ALT         '5'         IDM_FORMFEED_PRINTERIEC5
-ALT         '8'         IDM_ATTACH_8
-ALT         '9'         IDM_ATTACH_9
-ALT         '0'         IDM_ATTACH_10
-ALT         '1'         IDM_ATTACH_11
-ALT         'A'         IDM_DETACH_ALL
-ALT         'T'         IDM_ATTACH_TAPE
-ALT         'L'         IDM_LOADQUICK
-ALT         'S'         IDM_SAVEQUICK
-ALT         'M'         IDM_MONITOR
-ALT         'X'         IDM_EXIT
-ALT         'W'         IDM_TOGGLE_WARP_MODE
-ALT         'I'         IDM_FLIP_ADD
-ALT         'K'         IDM_FLIP_REMOVE
-ALT         'N'         IDM_FLIP_NEXT
-ALT         'B'         IDM_FLIP_PREVIOUS
-ALT         'J'         IDM_SWAP_JOYSTICK
-ALT         'C'         IDM_MEDIAFILE
-ALT         'G'         IDM_EVENT_SETMILESTONE
-ALT         'H'         IDM_EVENT_RESETMILESTONE
-ALT         'D'         IDM_TOGGLE_FULLSCREEN
-ALT         13          IDM_TOGGLE_FULLSCREEN               # VK_RETURN
-ALT         0x13        IDM_PAUSE                   Pause   # VK_PAUSE
-ALT         0xBB        IDM_SINGLE_FRAME_ADVANCE    +       # VK_OEM_PLUS   0xBB
-ALT         0x6B        IDM_SINGLE_FRAME_ADVANCE            # VK_ADD        0x6B
+CTRL|ALT        'R'         IDM_RESET_HARD                    R
+ALT             'R'         IDM_RESET_SOFT                    R
+ALT             '4'         IDM_FORMFEED_PRINTERIEC4          4
+ALT             '5'         IDM_FORMFEED_PRINTERIEC5          5
+ALT             '8'         IDM_ATTACH_8                      8
+ALT             '9'         IDM_ATTACH_9                      9
+ALT             '0'         IDM_ATTACH_10                     0
+ALT             '1'         IDM_ATTACH_11                     1
+ALT             'A'         IDM_DETACH_ALL                    A
+ALT             'T'         IDM_ATTACH_TAPE                   T
+ALT             'L'         IDM_LOADQUICK                     L
+ALT             'S'         IDM_SAVEQUICK                     S
+ALT             'M'         IDM_MONITOR                       M
+ALT             'X'         IDM_EXIT                          X
+ALT             'W'         IDM_TOGGLE_WARP_MODE              W
+ALT             'I'         IDM_FLIP_ADD                      I
+ALT             'K'         IDM_FLIP_REMOVE                   K
+ALT             'N'         IDM_FLIP_NEXT                     N
+ALT             'B'         IDM_FLIP_PREVIOUS                 B
+ALT             'J'         IDM_SWAP_JOYSTICK                 J
+ALT             'C'         IDM_MEDIAFILE                     C
+ALT             'G'         IDM_EVENT_SETMILESTONE            G
+ALT             'H'         IDM_EVENT_RESETMILESTONE          H
+ALT             'D'         IDM_TOGGLE_FULLSCREEN             D
+ALT             0x0D        IDM_TOGGLE_FULLSCREEN             D
+ALT             0x13        IDM_PAUSE                         Pause
+ALT             0xBB        IDM_SINGLE_FRAME_ADVANCE          +
+ALT             0x6B        IDM_SINGLE_FRAME_ADVANCE          +
+ALT             'Z'         IDM_CART_FREEZE                   Z
+ALT             'Q'         IDM_MOUSE                         Q
+ALT             0x79        IDM_TOGGLE_MAINCPU_TRACE          F10
+ALT             0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE        F11
+ALT             0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE        F12
+CTRL            'C'         IDM_EDIT_COPY                     C
+CTRL            'V'         IDM_EDIT_PASTE                    V
+CTRL            0x2D        IDM_EDIT_COPY                     C
 
-ALT         'Z'         IDM_CART_FREEZE
-ALT         'Q'         IDM_MOUSE
-
-ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
-ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
-ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
-
-CTRL        'C'         IDM_EDIT_COPY
-CTRL        'V'         IDM_EDIT_PASTE
-CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT
+#
+# Other command identifier that can be used in shortcuts
+#
+# IDM_FILE_EXIT                           IDM_ABOUT
+# IDM_AUTOSTART                           IDM_RESET_DRIVE8
+# IDM_RESET_DRIVE9                        IDM_RESET_DRIVE10
+# IDM_RESET_DRIVE11                       IDM_DETACH_TAPE
+# IDM_DATASETTE_CONTROL                   IDM_DETACH_8
+# IDM_DETACH_9                            IDM_DETACH_10
+# IDM_DETACH_11                           IDM_TOGGLE_SOUND
+# IDM_TOGGLE_DOUBLESIZE                   IDM_TOGGLE_DOUBLESCAN
+# IDM_TOGGLE_DRIVE_TRUE_EMULATION         IDM_TOGGLE_VIDEOCACHE
+# IDM_DRIVE_SETTINGS                      IDM_CART_ATTACH_CRT
+# IDM_CART_ATTACH_8KB                     IDM_CART_ATTACH_16KB
+# IDM_CART_ATTACH_AR                      IDM_CART_ATTACH_AR3
+# IDM_CART_ATTACH_AR4                     IDM_CART_ATTACH_STARDOS
+# IDM_CART_ATTACH_AT                      IDM_CART_ATTACH_EPYX
+# IDM_CART_ATTACH_IEEE488                 IDM_CART_ATTACH_RR
+# IDM_CART_ATTACH_SS4                     IDM_CART_ATTACH_SS5
+# IDM_CART_ATTACH_IDE64                   IDM_CART_ATTACH_FUNCLO
+# IDM_CART_ATTACH_FUNCHI                  IDM_CART_ATTACH_C1LO
+# IDM_CART_ATTACH_C1HI                    IDM_CART_ATTACH_C2LO
+# IDM_CART_ATTACH_C2HI                    IDM_CART_ATTACH_STB
+# IDM_CART_SET_DEFAULT                    IDM_CART_DETACH
+# IDM_CART_VIC20_8KB_2000                 IDM_CART_VIC20_8KB_6000
+# IDM_CART_VIC20_8KB_A000                 IDM_CART_VIC20_4KB_B000
+# IDM_CART_VIC20_16KB                     IDM_CART_VIC20_16KB_4000
+# IDM_CART_ENABLE_EXPERT                  IDM_CART_MODE_OFF
+# IDM_CART_MODE_PRG                       IDM_CART_MODE_ON
+# IDM_TOGGLE_CART_RESET                   IDM_SNAPSHOT_LOAD
+# IDM_SNAPSHOT_SAVE                       IDM_EVENT_DIRECTORY
+# IDM_EVENT_TOGGLE_RECORD                 IDM_EVENT_TOGGLE_PLAYBACK
+# IDM_EVENT_START_MODE_SAVE               IDM_EVENT_START_MODE_LOAD
+# IDM_EVENT_START_MODE_RESET              IDM_EVENT_START_MODE_PLAYBACK
+# IDM_NETWORK_SETTINGS                    IDM_SETTINGS_SAVE
+# IDM_SETTINGS_LOAD                       IDM_SETTINGS_DEFAULT
+# IDM_DEVICEMANAGER                       IDM_REFRESH_RATE_AUTO
+# IDM_REFRESH_RATE_1                      IDM_REFRESH_RATE_2
+# IDM_REFRESH_RATE_3                      IDM_REFRESH_RATE_4
+# IDM_REFRESH_RATE_5                      IDM_REFRESH_RATE_6
+# IDM_REFRESH_RATE_7                      IDM_REFRESH_RATE_8
+# IDM_REFRESH_RATE_9                      IDM_REFRESH_RATE_10
+# IDM_REFRESH_RATE_CUSTOM                 IDM_MAXIMUM_SPEED_200
+# IDM_MAXIMUM_SPEED_100                   IDM_MAXIMUM_SPEED_50
+# IDM_MAXIMUM_SPEED_20                    IDM_MAXIMUM_SPEED_10
+# IDM_MAXIMUM_SPEED_NO_LIMIT              IDM_MAXIMUM_SPEED_CUSTOM
+# IDM_VICII_SETTINGS                      IDM_PET_SETTINGS
+# IDM_CBM2_SETTINGS                       IDM_SYNC_FACTOR_PAL
+# IDM_SYNC_FACTOR_NTSC                    IDM_SYNC_FACTOR_NTSCOLD
+# IDM_JOY_SETTINGS                        IDM_SOUND_SETTINGS
+# IDM_STATUS_WINDOW                       IDM_HELP
+# IDM_DATASETTE_CONTROL_START             IDM_DATASETTE_CONTROL_STOP
+# IDM_DATASETTE_CONTROL_FORWARD           IDM_DATASETTE_CONTROL_REWIND
+# IDM_DATASETTE_CONTROL_RECORD            IDM_DATASETTE_CONTROL_RESET
+# IDM_DATASETTE_RESET_COUNTER             IDM_FLIP_LOAD
+# IDM_FLIP_SAVE                           IDM_REU_SETTINGS
+# IDM_GEORAM_SETTINGS                     IDM_RAMCART_SETTINGS
+# IDM_MMC64_SETTINGS                      IDM_TOGGLE_CRTCDOUBLESIZE
+# IDM_TOGGLE_CRTCDOUBLESCAN               IDM_TOGGLE_CRTCVIDEOCACHE
+# IDM_TOGGLE_EMUID                        IDM_IEEE488
+# IDM_DATASETTE_SETTINGS                  IDM_TOGGLE_VDC64KB
+# IDM_TOGGLE_VDC_DOUBLESIZE               IDM_TOGGLE_VDC_DOUBLESCAN
+# IDM_VIC_SETTINGS                        IDM_TOGGLE_VIRTUAL_DEVICES
+# IDM_CONTRIBUTORS                        IDM_LICENSE
+# IDM_WARRANTY                            IDM_CMDLINE
+# IDM_FULLSCREEN_SETTINGS                 IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT
+# IDM_TOGGLE_ALWAYSONTOP                  IDM_TOGGLE_CONFIRM_ON_EXIT
+# IDM_SID_SETTINGS                        IDM_TOGGLE_IFUNCTIONROM
+# IDM_IFUNCTIONROM_NAME                   IDM_TOGGLE_EFUNCTIONROM
+# IDM_EFUNCTIONROM_NAME                   IDM_TOGGLE_FASTPAL
+# IDM_VIDEO_SETTINGS                      IDM_PLUS4_SETTINGS
+# IDM_RAM_SETTINGS                        IDM_TFE_SETTINGS
+# IDM_TOGGLE_SCALE2X                      IDM_CUSTOM_SPEED
+# IDM_PRINTER_SETTINGS                    IDM_C128_SETTINGS
+# IDM_FORMFEED_PRINTERUSERPORT            IDM_ROM_SETTINGS
+# IDM_IDE64_SETTINGS                      IDM_ACIA_SETTINGS
+# IDM_RS232USER_SETTINGS                  IDM_RS232_SETTINGS
+# IDM_KEYBOARD_SETTINGS                   IDM_MOUSE_SETTINGS
+# IDM_DEBUG_MODE_NORMAL                   IDM_DEBUG_MODE_SMALL
+# IDM_DEBUG_MODE_HISTORY                  IDM_DEBUG_MODE_AUTOPLAY
+# IDM_LANG_EN                             IDM_LANG_DE
+# IDM_LANG_FR                             IDM_LANG_HU
+# IDM_LANG_IT                             IDM_LANG_NL
+# IDM_LANG_PL                             IDM_LANG_SV
+# IDM_MON_OPEN                            IDM_MON_SAVE
+# IDM_MON_PRINT                           IDM_MON_STOP_DEBUG
+# IDM_MON_STOP_EXEC                       IDM_MON_CURRENT
+# IDM_MON_STEP_INTO                       IDM_MON_STEP_OVER
+# IDM_MON_SKIP_RETURN                     IDM_MON_GOTO_CURSOR
+# IDM_MON_EVAL                            IDM_MON_WND_EVAL
+# IDM_MON_WND_REG                         IDM_MON_WND_MEM
+# IDM_MON_WND_DIS                         IDM_MON_WND_CONSOLE
+# IDM_MON_COMPUTER                        IDM_MON_DRIVE8
+# IDM_MON_DRIVE9                          IDM_MON_HELP
+# IDM_MON_CASCADE                         IDM_MON_TILE_HORIZ
+# IDM_MON_TILE_VERT                       IDM_MON_ARRANGE_ICONS
+# IDM_MON_GOTO_PC                         IDM_MON_GOTO_ADDRESS
+# IDM_MON_SET_BP                          IDM_MON_UNSET_BP
+# IDM_MON_ENABLE_BP                       IDM_MON_DISABLE_BP
+# IDM_WNDCHILD                            IDM_PLUS60K_SETTINGS
+# IDM_PLUS256K_SETTINGS                   IDM_C64_256K_SETTINGS
+# IDM_PETREU_SETTINGS                     IDM_SIDCART_SETTINGS
+# IDM_DIGIMAX_SETTINGS                    IDM_SOUND_RECORD_START
+# IDM_SOUND_RECORD_STOP                   

Modified: branches/amatthies/current/vice/data/PLUS4/win_shortcuts.vsc
===================================================================
--- branches/amatthies/current/vice/data/PLUS4/win_shortcuts.vsc	2008-08-04 21:29:21 UTC (rev 19111)
+++ branches/amatthies/current/vice/data/PLUS4/win_shortcuts.vsc	2008-08-05 20:34:47 UTC (rev 19112)
@@ -1,53 +1,153 @@
-
 #
 # VICE definition file for Keyboard Shortcuts in Win32
 #
-
-# Syntax
-# First column: Combination of ALT|CTRL to hold for the shortcut
+# Syntax:
+# First column: Combination of ALT|CTRL|SHIFT to or just KEY
 # Second column: (virtual) Keycode for the shortcut
 #   Code can be character ('X'), hex (0xAB) or decimal (168)
 #   Have a look at winuser.h for the list of virtual key codes (VK_..)
 # Third column: command identifier that is executed with the shortcut
-# Fourth column: text to display in the menu item; missing this lets 
+# Fourth column: text to display in the menu item; missing this lets
 #   the keycode char be displayed.
 
-CTRL|ALT    'R'         IDM_RESET_HARD
-ALT         'R'         IDM_RESET_SOFT
-ALT         '4'         IDM_FORMFEED_PRINTERIEC4
-ALT         '5'         IDM_FORMFEED_PRINTERIEC5
-ALT         '8'         IDM_ATTACH_8
-ALT         '9'         IDM_ATTACH_9
-ALT         '0'         IDM_ATTACH_10
-ALT         '1'         IDM_ATTACH_11
-ALT         'A'         IDM_DETACH_ALL
-ALT         'T'         IDM_ATTACH_TAPE
-ALT         'L'         IDM_LOADQUICK
-ALT         'S'         IDM_SAVEQUICK
-ALT         'M'         IDM_MONITOR
-ALT         'X'         IDM_EXIT
-ALT         'W'         IDM_TOGGLE_WARP_MODE
-ALT         'I'         IDM_FLIP_ADD
-ALT         'K'         IDM_FLIP_REMOVE
-ALT         'N'         IDM_FLIP_NEXT
-ALT         'B'         IDM_FLIP_PREVIOUS
-ALT         'J'         IDM_SWAP_JOYSTICK
-ALT         'C'         IDM_MEDIAFILE
-ALT         'G'         IDM_EVENT_SETMILESTONE
-ALT         'H'         IDM_EVENT_RESETMILESTONE
-ALT         'D'         IDM_TOGGLE_FULLSCREEN
-ALT         13          IDM_TOGGLE_FULLSCREEN               # VK_RETURN
-ALT         0x13        IDM_PAUSE                   Pause   # VK_PAUSE
-ALT         0xBB        IDM_SINGLE_FRAME_ADVANCE    +       # VK_OEM_PLUS   0xBB
-ALT         0x6B        IDM_SINGLE_FRAME_ADVANCE            # VK_ADD        0x6B
+CTRL|ALT        'R'         IDM_RESET_HARD                    R
+ALT             'R'         IDM_RESET_SOFT                    R
+ALT             '4'         IDM_FORMFEED_PRINTERIEC4          4
+ALT             '5'         IDM_FORMFEED_PRINTERIEC5          5
+ALT             '8'         IDM_ATTACH_8                      8
+ALT             '9'         IDM_ATTACH_9                      9
+ALT             '0'         IDM_ATTACH_10                     0
+ALT             '1'         IDM_ATTACH_11                     1
+ALT             'A'         IDM_DETACH_ALL                    A
+ALT             'T'         IDM_ATTACH_TAPE                   T
+ALT             'L'         IDM_LOADQUICK                     L
+ALT             'S'         IDM_SAVEQUICK                     S
+ALT             'M'         IDM_MONITOR                       M
+ALT             'X'         IDM_EXIT                          X
+ALT             'W'         IDM_TOGGLE_WARP_MODE              W
+ALT             'I'         IDM_FLIP_ADD                      I
+ALT             'K'         IDM_FLIP_REMOVE                   K
+ALT             'N'         IDM_FLIP_NEXT                     N
+ALT             'B'         IDM_FLIP_PREVIOUS                 B
+ALT             'J'         IDM_SWAP_JOYSTICK                 J
+ALT             'C'         IDM_MEDIAFILE                     C
+ALT             'G'         IDM_EVENT_SETMILESTONE            G
+ALT             'H'         IDM_EVENT_RESETMILESTONE          H
+ALT             'D'         IDM_TOGGLE_FULLSCREEN             D
+ALT             0x0D        IDM_TOGGLE_FULLSCREEN             D
+ALT             0x13        IDM_PAUSE                         Pause
+ALT             0xBB        IDM_SINGLE_FRAME_ADVANCE          +
+ALT             0x6B        IDM_SINGLE_FRAME_ADVANCE          +
+ALT             'Z'         IDM_CART_FREEZE                   Z
+ALT             'Q'         IDM_MOUSE                         Q
+ALT             0x79        IDM_TOGGLE_MAINCPU_TRACE          F10
+ALT             0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE        F11
+ALT             0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE        F12
+CTRL            'C'         IDM_EDIT_COPY                     C
+CTRL            'V'         IDM_EDIT_PASTE                    V
+CTRL            0x2D        IDM_EDIT_COPY                     C
 
-ALT         'Z'         IDM_CART_FREEZE
-ALT         'Q'         IDM_MOUSE
-
-ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
-ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
-ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
-
-CTRL        'C'         IDM_EDIT_COPY
-CTRL        'V'         IDM_EDIT_PASTE
-CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT
+#
+# Other command identifier that can be used in shortcuts
+#
+# IDM_FILE_EXIT                           IDM_ABOUT
+# IDM_AUTOSTART                           IDM_RESET_DRIVE8
+# IDM_RESET_DRIVE9                        IDM_RESET_DRIVE10
+# IDM_RESET_DRIVE11                       IDM_DETACH_TAPE
+# IDM_DATASETTE_CONTROL                   IDM_DETACH_8
+# IDM_DETACH_9                            IDM_DETACH_10
+# IDM_DETACH_11                           IDM_TOGGLE_SOUND
+# IDM_TOGGLE_DOUBLESIZE                   IDM_TOGGLE_DOUBLESCAN
+# IDM_TOGGLE_DRIVE_TRUE_EMULATION         IDM_TOGGLE_VIDEOCACHE
+# IDM_DRIVE_SETTINGS                      IDM_CART_ATTACH_CRT
+# IDM_CART_ATTACH_8KB                     IDM_CART_ATTACH_16KB
+# IDM_CART_ATTACH_AR                      IDM_CART_ATTACH_AR3
+# IDM_CART_ATTACH_AR4                     IDM_CART_ATTACH_STARDOS
+# IDM_CART_ATTACH_AT                      IDM_CART_ATTACH_EPYX
+# IDM_CART_ATTACH_IEEE488                 IDM_CART_ATTACH_RR
+# IDM_CART_ATTACH_SS4                     IDM_CART_ATTACH_SS5
+# IDM_CART_ATTACH_IDE64                   IDM_CART_ATTACH_FUNCLO
+# IDM_CART_ATTACH_FUNCHI                  IDM_CART_ATTACH_C1LO
+# IDM_CART_ATTACH_C1HI                    IDM_CART_ATTACH_C2LO
+# IDM_CART_ATTACH_C2HI                    IDM_CART_ATTACH_STB
+# IDM_CART_SET_DEFAULT                    IDM_CART_DETACH
+# IDM_CART_VIC20_8KB_2000                 IDM_CART_VIC20_8KB_6000
+# IDM_CART_VIC20_8KB_A000                 IDM_CART_VIC20_4KB_B000
+# IDM_CART_VIC20_16KB                     IDM_CART_VIC20_16KB_4000
+# IDM_CART_ENABLE_EXPERT                  IDM_CART_MODE_OFF
+# IDM_CART_MODE_PRG                       IDM_CART_MODE_ON
+# IDM_TOGGLE_CART_RESET                   IDM_SNAPSHOT_LOAD
+# IDM_SNAPSHOT_SAVE                       IDM_EVENT_DIRECTORY
+# IDM_EVENT_TOGGLE_RECORD                 IDM_EVENT_TOGGLE_PLAYBACK
+# IDM_EVENT_START_MODE_SAVE               IDM_EVENT_START_MODE_LOAD
+# IDM_EVENT_START_MODE_RESET              IDM_EVENT_START_MODE_PLAYBACK
+# IDM_NETWORK_SETTINGS                    IDM_SETTINGS_SAVE
+# IDM_SETTINGS_LOAD                       IDM_SETTINGS_DEFAULT
+# IDM_DEVICEMANAGER                       IDM_REFRESH_RATE_AUTO
+# IDM_REFRESH_RATE_1                      IDM_REFRESH_RATE_2
+# IDM_REFRESH_RATE_3                      IDM_REFRESH_RATE_4
+# IDM_REFRESH_RATE_5                      IDM_REFRESH_RATE_6
+# IDM_REFRESH_RATE_7                      IDM_REFRESH_RATE_8
+# IDM_REFRESH_RATE_9                      IDM_REFRESH_RATE_10
+# IDM_REFRESH_RATE_CUSTOM                 IDM_MAXIMUM_SPEED_200
+# IDM_MAXIMUM_SPEED_100                   IDM_MAXIMUM_SPEED_50
+# IDM_MAXIMUM_SPEED_20                    IDM_MAXIMUM_SPEED_10
+# IDM_MAXIMUM_SPEED_NO_LIMIT              IDM_MAXIMUM_SPEED_CUSTOM
+# IDM_VICII_SETTINGS                      IDM_PET_SETTINGS
+# IDM_CBM2_SETTINGS                       IDM_SYNC_FACTOR_PAL
+# IDM_SYNC_FACTOR_NTSC                    IDM_SYNC_FACTOR_NTSCOLD
+# IDM_JOY_SETTINGS                        IDM_SOUND_SETTINGS
+# IDM_STATUS_WINDOW                       IDM_HELP
+# IDM_DATASETTE_CONTROL_START             IDM_DATASETTE_CONTROL_STOP
+# IDM_DATASETTE_CONTROL_FORWARD           IDM_DATASETTE_CONTROL_REWIND
+# IDM_DATASETTE_CONTROL_RECORD            IDM_DATASETTE_CONTROL_RESET
+# IDM_DATASETTE_RESET_COUNTER             IDM_FLIP_LOAD
+# IDM_FLIP_SAVE                           IDM_REU_SETTINGS
+# IDM_GEORAM_SETTINGS                     IDM_RAMCART_SETTINGS
+# IDM_MMC64_SETTINGS                      IDM_TOGGLE_CRTCDOUBLESIZE
+# IDM_TOGGLE_CRTCDOUBLESCAN               IDM_TOGGLE_CRTCVIDEOCACHE
+# IDM_TOGGLE_EMUID                        IDM_IEEE488
+# IDM_DATASETTE_SETTINGS                  IDM_TOGGLE_VDC64KB
+# IDM_TOGGLE_VDC_DOUBLESIZE               IDM_TOGGLE_VDC_DOUBLESCAN
+# IDM_VIC_SETTINGS                        IDM_TOGGLE_VIRTUAL_DEVICES
+# IDM_CONTRIBUTORS                        IDM_LICENSE
+# IDM_WARRANTY                            IDM_CMDLINE
+# IDM_FULLSCREEN_SETTINGS                 IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT
+# IDM_TOGGLE_ALWAYSONTOP                  IDM_TOGGLE_CONFIRM_ON_EXIT
+# IDM_SID_SETTINGS                        IDM_TOGGLE_IFUNCTIONROM
+# IDM_IFUNCTIONROM_NAME                   IDM_TOGGLE_EFUNCTIONROM
+# IDM_EFUNCTIONROM_NAME                   IDM_TOGGLE_FASTPAL
+# IDM_VIDEO_SETTINGS                      IDM_PLUS4_SETTINGS
+# IDM_RAM_SETTINGS                        IDM_TFE_SETTINGS
+# IDM_TOGGLE_SCALE2X                      IDM_CUSTOM_SPEED
+# IDM_PRINTER_SETTINGS                    IDM_C128_SETTINGS
+# IDM_FORMFEED_PRINTERUSERPORT            IDM_ROM_SETTINGS
+# IDM_IDE64_SETTINGS                      IDM_ACIA_SETTINGS
+# IDM_RS232USER_SETTINGS                  IDM_RS232_SETTINGS
+# IDM_KEYBOARD_SETTINGS                   IDM_MOUSE_SETTINGS
+# IDM_DEBUG_MODE_NORMAL                   IDM_DEBUG_MODE_SMALL
+# IDM_DEBUG_MODE_HISTORY                  IDM_DEBUG_MODE_AUTOPLAY
+# IDM_LANG_EN                             IDM_LANG_DE
+# IDM_LANG_FR                             IDM_LANG_HU
+# IDM_LANG_IT                             IDM_LANG_NL
+# IDM_LANG_PL                             IDM_LANG_SV
+# IDM_MON_OPEN                            IDM_MON_SAVE
+# IDM_MON_PRINT                           IDM_MON_STOP_DEBUG
+# IDM_MON_STOP_EXEC                       IDM_MON_CURRENT
+# IDM_MON_STEP_INTO                       IDM_MON_STEP_OVER
+# IDM_MON_SKIP_RETURN                     IDM_MON_GOTO_CURSOR
+# IDM_MON_EVAL                            IDM_MON_WND_EVAL
+# IDM_MON_WND_REG                         IDM_MON_WND_MEM
+# IDM_MON_WND_DIS                         IDM_MON_WND_CONSOLE
+# IDM_MON_COMPUTER                        IDM_MON_DRIVE8
+# IDM_MON_DRIVE9                          IDM_MON_HELP
+# IDM_MON_CASCADE                         IDM_MON_TILE_HORIZ
+# IDM_MON_TILE_VERT                       IDM_MON_ARRANGE_ICONS
+# IDM_MON_GOTO_PC                         IDM_MON_GOTO_ADDRESS
+# IDM_MON_SET_BP                          IDM_MON_UNSET_BP
+# IDM_MON_ENABLE_BP                       IDM_MON_DISABLE_BP
+# IDM_WNDCHILD                            IDM_PLUS60K_SETTINGS
+# IDM_PLUS256K_SETTINGS                   IDM_C64_256K_SETTINGS
+# IDM_PETREU_SETTINGS                     IDM_SIDCART_SETTINGS
+# IDM_DIGIMAX_SETTINGS                    IDM_SOUND_RECORD_START
+# IDM_SOUND_RECORD_STOP                   

Modified: branches/amatthies/current/vice/data/VIC20/win_shortcuts.vsc
===================================================================
--- branches/amatthies/current/vice/data/VIC20/win_shortcuts.vsc	2008-08-04 21:29:21 UTC (rev 19111)
+++ branches/amatthies/current/vice/data/VIC20/win_shortcuts.vsc	2008-08-05 20:34:47 UTC (rev 19112)
@@ -1,53 +1,153 @@
-
 #
 # VICE definition file for Keyboard Shortcuts in Win32
 #
-
-# Syntax
-# First column: Combination of ALT|CTRL to hold for the shortcut
+# Syntax:
+# First column: Combination of ALT|CTRL|SHIFT to or just KEY
 # Second column: (virtual) Keycode for the shortcut
 #   Code can be character ('X'), hex (0xAB) or decimal (168)
 #   Have a look at winuser.h for the list of virtual key codes (VK_..)
 # Third column: command identifier that is executed with the shortcut
-# Fourth column: text to display in the menu item; missing this lets 
+# Fourth column: text to display in the menu item; missing this lets
 #   the keycode char be displayed.
 
-CTRL|ALT    'R'         IDM_RESET_HARD
-ALT         'R'         IDM_RESET_SOFT
-ALT         '4'         IDM_FORMFEED_PRINTERIEC4
-ALT         '5'         IDM_FORMFEED_PRINTERIEC5
-ALT         '8'         IDM_ATTACH_8
-ALT         '9'         IDM_ATTACH_9
-ALT         '0'         IDM_ATTACH_10
-ALT         '1'         IDM_ATTACH_11
-ALT         'A'         IDM_DETACH_ALL
-ALT         'T'         IDM_ATTACH_TAPE
-ALT         'L'         IDM_LOADQUICK
-ALT         'S'         IDM_SAVEQUICK
-ALT         'M'         IDM_MONITOR
-ALT         'X'         IDM_EXIT
-ALT         'W'         IDM_TOGGLE_WARP_MODE
-ALT         'I'         IDM_FLIP_ADD
-ALT         'K'         IDM_FLIP_REMOVE
-ALT         'N'         IDM_FLIP_NEXT
-ALT         'B'         IDM_FLIP_PREVIOUS
-ALT         'J'         IDM_SWAP_JOYSTICK
-ALT         'C'         IDM_MEDIAFILE
-ALT         'G'         IDM_EVENT_SETMILESTONE
-ALT         'H'         IDM_EVENT_RESETMILESTONE
-ALT         'D'         IDM_TOGGLE_FULLSCREEN
-ALT         13          IDM_T...
 
[truncated message content]

[Vice-emu-commit] SF.net SVN: vice-emu:[19111] branches/fabrizio/v1.22.13-newjoydesign/vice/ src/arch/win32

From: <fa...@us...> - 2008-08-04 21:29:17

Revision: 19111
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19111&view=rev
Author:   fabbo
Date:     2008-08-04 21:29:21 +0000 (Mon, 04 Aug 2008)

Log Message:
-----------
Preliminary version of a non-DirectInput mouse driver

Modified Paths:
--------------
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/mousedrv.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c
    branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/vsyncarch.c

Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/mousedrv.c
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/mousedrv.c	2008-08-03 02:59:34 UTC (rev 19110)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/mousedrv.c	2008-08-04 21:29:21 UTC (rev 19111)
@@ -38,49 +38,11 @@
 
 
 int _mouse_x, _mouse_y;
-static int mouse_acquired = 0;
-LPDIRECTINPUTDEVICE di_mouse = NULL;
 
-#ifndef HAVE_GUIDLIB
-const GUID GUID_XAxis = { 0xA36D02E0, 0xC9F3, 0x11CF,
-                        { 0xBF, 0xC7, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00 } };
-const GUID GUID_YAxis = { 0xA36D02E1, 0xC9F3, 0x11CF,
-                        { 0xBF, 0xC7, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00 } };
-const GUID GUID_Button = { 0xA36D02F0, 0xC9F3, 0x11CF,
-                         { 0xBF, 0xC7, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00 } };
-const GUID GUID_SysMouse = { 0x6F1D2B60, 0xD5A0, 0x11CF,
-                           { 0xBF, 0xC7, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00} };
-#endif
-
-typedef struct mouse_data_t {
-    DWORD X;
-    DWORD Y;
-    BYTE LeftButton;
-    BYTE RightButton;
-    BYTE padding[2];
-} mouse_data;
-
-DIOBJECTDATAFORMAT mouse_objects[] = {
-    { &GUID_XAxis, 0, DIDFT_AXIS | DIDFT_ANYINSTANCE, 0 },
-    { &GUID_YAxis, 4, DIDFT_AXIS | DIDFT_ANYINSTANCE, 0 },
-    { &GUID_Button, 8, DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0 },
-    { &GUID_Button, 9, DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0 }
-};
-
-DIDATAFORMAT mouse_data_format={
-    sizeof(DIDATAFORMAT),
-    sizeof(DIOBJECTDATAFORMAT),
-    DIDF_RELAXIS,
-    sizeof(mouse_data),
-    4,
-    mouse_objects
-};
-
 /* ------------------------------------------------------------------------- */
 
 void mousedrv_mouse_changed(void)
 {
-    mouse_update_mouse_acquire();
 }
 
 int mousedrv_resources_init(void)
@@ -95,83 +57,10 @@
 
 /* ------------------------------------------------------------------------- */
 
-void mouse_set_format(void)
-{
-    HRESULT result;
-
-    result = IDirectInputDevice_SetDataFormat(di_mouse, &mouse_data_format);
-    if (result != DI_OK) {
-        log_debug("Can't set Mouse DataFormat");
-        di_mouse = NULL;
-    }
-}
-
-void mouse_update_mouse(void)
-{
-    mouse_data state;
-    HRESULT result;
-
-    if (di_mouse == NULL)
-        return;
-
-    result = DIERR_INPUTLOST;
-    while (result == DIERR_INPUTLOST) {
-        result = IDirectInputDevice_GetDeviceState(di_mouse, sizeof(mouse_data),
-                                                   &state);
-        if (result == DIERR_INPUTLOST) {
-            result = IDirectInputDevice_Acquire(di_mouse);
-            if (result != DI_OK) {
-                return;
-            }
-        }
-    }
-    if (result != DI_OK) return;
-
-    _mouse_x += state.X;
-    _mouse_y += state.Y;
-
-    mouse_button_left((int)(state.LeftButton & 0x80));
-    mouse_button_right((int)(state.RightButton & 0x80));
-}
-
 void mousedrv_init(void)
 {
 }
 
-void mouse_set_cooperative_level(void)
-{
-    HRESULT result;
-
-    result = IDirectInputDevice_SetCooperativeLevel(
-             di_mouse, ui_active_window, DISCL_EXCLUSIVE | DISCL_FOREGROUND);
-    if (result != DI_OK) {
-        log_debug("Warning: couldn't set cooperation level of mice to exclusive! %i",
-                  (int)ui_active_window);
-        di_mouse = NULL;
-    }
-}
-
-void mouse_update_mouse_acquire(void)
-{
-    if (di_mouse == NULL)
-        return;
-    if (_mouse_enabled) {
-        if (ui_active) {
-            mouse_set_cooperative_level();
-            IDirectInputDevice_Acquire(di_mouse);
-            mouse_acquired = 1;
-        } else {
-            IDirectInputDevice_Unacquire(di_mouse);
-            mouse_acquired = 0;
-        }
-    } else {
-        if (mouse_acquired) {
-            IDirectInputDevice_Unacquire(di_mouse);
-            mouse_acquired = 0;
-        }
-    }
-}
-
 BYTE mousedrv_get_x(void)
 {
     if (!_mouse_enabled)

Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c	2008-08-03 02:59:34 UTC (rev 19110)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/ui.c	2008-08-04 21:29:21 UTC (rev 19111)
@@ -89,6 +89,7 @@
 
 
 extern char *intl_speed_at_text;
+extern int _mouse_x, _mouse_y;
 
 #define countof(array) (sizeof(array) / sizeof((array)[0]))
 
@@ -1380,7 +1381,7 @@
 //          if (!fullscreen_transition)
 //              ResumeFullscreenMode(window);
         }
-        mouse_update_mouse_acquire();
+        //mouse_update_mouse_acquire();
         break;
       case WM_SIZE:
         if (window_index<number_of_windows) {
@@ -1401,7 +1402,6 @@
       case WM_ENTERSIZEMOVE:
         vsync_suspend_speed_eval();
         ui_active = FALSE;
-        mouse_update_mouse_acquire();
         break;
       case WM_EXITMENULOOP:
       case WM_EXITSIZEMOVE:
@@ -1410,7 +1410,6 @@
         } else {
             ui_active = FALSE;
         }
-        mouse_update_mouse_acquire();
         break;
       case WM_MOVE:
         ui_wm_move(window, window_index);
@@ -1485,6 +1484,10 @@
       case WM_NOTIFY:
         statusbar_notify(window, window_index, wparam, lparam);
         break;
+      case WM_MOUSEMOVE:
+        _mouse_x =  lparam        & 0xFF;
+        _mouse_y = (lparam >> 16) & 0xFF;
+        break;
     }
 
     return DefWindowProc(window, msg, wparam, lparam);

Modified: branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/vsyncarch.c
===================================================================
--- branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/vsyncarch.c	2008-08-03 02:59:34 UTC (rev 19110)
+++ branches/fabrizio/v1.22.13-newjoydesign/vice/src/arch/win32/vsyncarch.c	2008-08-04 21:29:21 UTC (rev 19111)
@@ -198,9 +198,6 @@
 
 void vsyncarch_presync(void)
 {
-    /* Update mouse */
-    mouse_update_mouse();
-
     /* Flush keypresses emulated through the keyboard buffer.  */
     kbdbuf_flush();
     joystick_update();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19110] trunk/vice

From: <bla...@us...> - 2008-08-03 02:59:26

Revision: 19110
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19110&view=rev
Author:   blackystardust
Date:     2008-08-03 02:59:34 +0000 (Sun, 03 Aug 2008)

Log Message:
-----------
Applied Mac OS X fixes as provided by Chris.

Modified Paths:
--------------
    trunk/vice/build/macosx/build-gtk.sh
    trunk/vice/build/macosx/build-inc.sh
    trunk/vice/build/macosx/build-vice-dist.sh
    trunk/vice/src/arch/unix/x11/gnome/x11ui.c

Modified: trunk/vice/build/macosx/build-gtk.sh
===================================================================
--- trunk/vice/build/macosx/build-gtk.sh	2008-08-03 02:58:36 UTC (rev 19109)
+++ trunk/vice/build/macosx/build-gtk.sh	2008-08-03 02:59:34 UTC (rev 19110)
@@ -20,6 +20,7 @@
 make_dirs bin lib include man share
 
 # setup compiler environment
+USE_X11=1
 set_compiler_env
 
 echo "===== gtk+ build for $ARCH ====="
@@ -61,6 +62,7 @@
 # glib
 configure_make_install glib-2.14.5.tar.bz2 glib-2.14.5 lib/libglib-2.0.dylib install \
                        "http://www.gtk.org/"
+
 # cairo
 configure_make_install cairo-1.4.14.tar.gz cairo-1.4.14 lib/libcairo.dylib install \
                        "http://cairographics.org/"

Modified: trunk/vice/build/macosx/build-inc.sh
===================================================================
--- trunk/vice/build/macosx/build-inc.sh	2008-08-03 02:58:36 UTC (rev 19109)
+++ trunk/vice/build/macosx/build-inc.sh	2008-08-03 02:59:34 UTC (rev 19110)
@@ -177,6 +177,11 @@
   #  EXTRA_OPT="--host=$ARCH-apple-darwin`uname -r`"
   #fi
   
+  # use X11 from SDK
+  if [ "$USE_X11" = "1" ]; then 
+    EXTRA_OPT="--x-includes=$SDK/usr/X11R6/include --x-libraries=$SDK/usr/X11R6/lib"
+  fi
+  
   export COMPILE_TAG="-arch $ARCH -isysroot $SDK -mmacosx-version-min=$SDK_VERSION"
   export CC="gcc $COMPILE_TAG"
   export CXX="g++ $COMPILE_TAG"

Modified: trunk/vice/build/macosx/build-vice-dist.sh
===================================================================
--- trunk/vice/build/macosx/build-vice-dist.sh	2008-08-03 02:58:36 UTC (rev 19109)
+++ trunk/vice/build/macosx/build-vice-dist.sh	2008-08-03 02:59:34 UTC (rev 19110)
@@ -217,7 +217,8 @@
     CC="gcc -arch $BUILD_ARCH -isysroot $BUILD_SDK -mmacosx-version-min=$BUILD_SDK_VERSION" \
     CXX="g++ -arch $BUILD_ARCH -isysroot $BUILD_SDK -mmacosx-version-min=$BUILD_SDK_VERSION" \
     LD="gcc -arch $BUILD_ARCH -isysroot $BUILD_SDK -mmacosx-version-min=$BUILD_SDK_VERSION" \
-    $VICE_SRC/configure --host=$BUILD_ARCH2-apple-darwin $CONFIGURE_FLAGS
+    $VICE_SRC/configure --host=$BUILD_ARCH2-apple-darwin $CONFIGURE_FLAGS \
+      --x-includes=$BUILD_SDK/usr/X11R6/include --x-libraries=$BUILD_SDK/usr/X11R6/lib
   set +x
   make
   popd

Modified: trunk/vice/src/arch/unix/x11/gnome/x11ui.c
===================================================================
--- trunk/vice/src/arch/unix/x11/gnome/x11ui.c	2008-08-03 02:58:36 UTC (rev 19109)
+++ trunk/vice/src/arch/unix/x11/gnome/x11ui.c	2008-08-03 02:59:34 UTC (rev 19110)
@@ -2736,12 +2736,22 @@
 
             glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-            glEnable (GL_TEXTURE_RECTANGLE_ARB);
-            glBindTexture (GL_TEXTURE_RECTANGLE_ARB, canvas->screen_texture);
+#ifdef GL_TEXTURE_RECTANGLE_NV
+#define GL_TEX_RECT GL_TEXTURE_RECTANGLE_NV
+#else
+#ifdef GL_TEXTURE_RECTANGLE_ARB
+#define GL_TEX_RECT GL_TEXTURE_RECTANGLE_ARB
+#else
+#error GL_TEXTURE_RECTANGLE not supported in you OpenGL headers
+#endif
+#endif
 
-            glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-            glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-            glTexImage2D  (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGB, 
+            glEnable (GL_TEX_RECT);
+            glBindTexture (GL_TEX_RECT, canvas->screen_texture);
+
+            glTexParameteri (GL_TEX_RECT, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+            glTexParameteri (GL_TEX_RECT, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+            glTexImage2D  (GL_TEX_RECT, 0, GL_RGB, 
                 canvas->gdk_image_size.width, canvas->gdk_image_size.height,
                 0, GL_RGB, GL_UNSIGNED_BYTE, canvas->gdk_image);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19109] trunk/vice/src/arch/unix/x11/gnome/uicolor.c

From: <bla...@us...> - 2008-08-03 02:58:26

Revision: 19109
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19109&view=rev
Author:   blackystardust
Date:     2008-08-03 02:58:36 +0000 (Sun, 03 Aug 2008)

Log Message:
-----------
Applied GTK big endian fix as provided by Chris.

Modified Paths:
--------------
    trunk/vice/src/arch/unix/x11/gnome/uicolor.c

Modified: trunk/vice/src/arch/unix/x11/gnome/uicolor.c
===================================================================
--- trunk/vice/src/arch/unix/x11/gnome/uicolor.c	2008-08-02 20:20:56 UTC (rev 19108)
+++ trunk/vice/src/arch/unix/x11/gnome/uicolor.c	2008-08-03 02:58:36 UTC (rev 19109)
@@ -101,14 +101,12 @@
 
     for (i = 0; i < palette->num_entries; i++) {
         palette_entry_t color = palette->entries[i];
-        DWORD color_pixel;
-	
-	unsigned char *col = (unsigned char *)&color_pixel;
-	col[0] = color.red  ;
-	col[1] = color.green;
-	col[2] = color.blue ;
-	video_render_setphysicalcolor(((video_canvas_t*)c)->videoconfig, i,
-				      color_pixel, 24);
+        DWORD color_pixel = 
+            (DWORD)color.red |
+            (DWORD)color.green << 8 |
+            (DWORD)color.blue << 16;
+	    video_render_setphysicalcolor(((video_canvas_t*)c)->videoconfig, i,
+            color_pixel, 24);
     }
     return 0;
 }
@@ -116,27 +114,11 @@
 static void uicolor_init_video_colors()
 {
     short i;
-    DWORD pixelr, pixelg, pixelb;
     
-    for (i = 0; i < 256; i++)
-    {
-	unsigned char* pixelrbyte = (unsigned char*)&pixelr;
-	unsigned char* pixelgbyte = (unsigned char*)&pixelg;
-	unsigned char* pixelbbyte = (unsigned char*)&pixelb;
-	pixelrbyte[0] = i;
-	pixelrbyte[1] = 0;
-	pixelrbyte[2] = 0;
-	pixelgbyte[0] = 0;
-	pixelgbyte[1] = i;
-	pixelgbyte[2] = 0;
-	pixelbbyte[0] = 0;
-	pixelbbyte[1] = 0;
-	pixelbbyte[2] = i;
-       
-	video_render_setrawrgb(i, 
-			       pixelr,
-			       pixelg,
-			       pixelb);
+    for (i = 0; i < 256; i++) {
+	    video_render_setrawrgb(i, 
+		    (DWORD)i, (DWORD)i << 8, (DWORD)i << 16
+	    );
     }
     
     video_render_initraw();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19108] branches/pottendo/v2.0-work/vice/src/vsyncapi. h

From: <pot...@us...> - 2008-08-02 20:20:48

Revision: 19108
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19108&view=rev
Author:   pottendo
Date:     2008-08-02 20:20:56 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
New API: vsyncarch_sync_with_raster().

Modified Paths:
--------------
    branches/pottendo/v2.0-work/vice/src/vsyncapi.h

Modified: branches/pottendo/v2.0-work/vice/src/vsyncapi.h
===================================================================
--- branches/pottendo/v2.0-work/vice/src/vsyncapi.h	2008-08-02 20:20:17 UTC (rev 19107)
+++ branches/pottendo/v2.0-work/vice/src/vsyncapi.h	2008-08-02 20:20:56 UTC (rev 19108)
@@ -66,4 +66,7 @@
 
 extern int vsyncarch_vbl_sync_enabled(void);
 
+/* wait for next vertical retrace */
+extern void vsyncarch_sync_with_raster(struct video_canvas_s *c);
+
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19107] branches/pottendo/v2.0-work/vice/src/vsync.c

From: <pot...@us...> - 2008-08-02 20:20:09

Revision: 19107
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19107&view=rev
Author:   pottendo
Date:     2008-08-02 20:20:17 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Moved in generic vblank code from src/arch/win32/vsync.c.
Now the code is used both in win32 and openGL_sync-capable archs.

Modified Paths:
--------------
    branches/pottendo/v2.0-work/vice/src/vsync.c

Modified: branches/pottendo/v2.0-work/vice/src/vsync.c
===================================================================
--- branches/pottendo/v2.0-work/vice/src/vsync.c	2008-08-02 20:18:34 UTC (rev 19106)
+++ branches/pottendo/v2.0-work/vice/src/vsync.c	2008-08-02 20:20:17 UTC (rev 19107)
@@ -316,7 +316,7 @@
     signed long delay;
     long frame_ticks_remainder, frame_ticks_integer, compval;
 
-#ifdef WIN32
+#if defined(WIN32) || defined(HAVE_OPENGL_SYNC)
     float refresh_cmp;
     int refresh_div;
 #endif
@@ -409,7 +409,7 @@
 
     /* This is the time between the start of the next frame and now. */
     delay = (signed long)(now - next_frame_start);
-#ifdef WIN32
+#if defined(WIN32) || defined(HAVE_OPENGL_SYNC)
     refresh_cmp = (float)(c->refreshrate / refresh_frequency);
     refresh_div = (int)(refresh_cmp + 0.5f);
     refresh_cmp /= (float)refresh_div;
@@ -434,7 +434,7 @@
     if (!warp_mode_enabled && timer_speed && delay < 0) {
         vsyncarch_sleep(-delay);
     }
-#ifdef WIN32
+#if defined(WIN32) || defined(HAVE_OPENGL_SYNC)
     vsyncarch_prepare_vbl();
 #endif
     /*
@@ -470,7 +470,7 @@
         skip_next_frame = 0;
         skipped_redraw = 0;
     }
-#ifdef WIN32
+#if defined(WIN32) || defined(HAVE_OPENGL_SYNC)
 	}
 #endif
 
@@ -536,5 +536,49 @@
     return skip_next_frame;
 }
 
+#if defined(WIN32) || defined (HAVE_OPENGL_SYNC) 
+
+static unsigned long last = 0;
+static unsigned long nosynccount = 0;
+
+void vsyncarch_verticalblank(video_canvas_t *c, float rate, int frames)
+{
+    unsigned long nowi, lastx, max, frm, vbl;
+
+    if (c->refreshrate <= 0.0f)
+        return;
+
+    nowi = vsyncarch_frequency();
+
+    /* calculate counter cycles per frame */
+    frm = (unsigned long)((float)(nowi * frames) / rate);
+
+    nowi = vsyncarch_gettime();
+
+    lastx = last - (frm * nosynccount);
+    max = (frm * 7) >> 3;
+    vbl = 0;
+    while (max >= (nowi - lastx)) {
+	vsyncarch_sync_with_raster(c);
+        nowi = vsyncarch_gettime();
+        vbl = 1;
+    }
+    if ((!vbl) && (nosynccount < 16)) {
+        nosynccount ++;
+    } else {
+        last = nowi;
+        nosynccount = 0;
+    }
+}
+
+void vsyncarch_prepare_vbl(void)
+{
+    /* keep vertical blank data prepared */
+    last = vsyncarch_gettime();
+    nosynccount = 0;
+}
+
+#endif /* WIN32 || HAVE_OPENGL_SYNC */
+
 #endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19106] branches/pottendo/v2.0-work/vice/src/arch/ win32/vsyncarch.c

From: <pot...@us...> - 2008-08-02 20:18:25

Revision: 19106
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19106&view=rev
Author:   pottendo
Date:     2008-08-02 20:18:34 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Moved generic vblank code to src/vsync.c.
(vsyncarch_sync_with_raster): New function.

Modified Paths:
--------------
    branches/pottendo/v2.0-work/vice/src/arch/win32/vsyncarch.c

Modified: branches/pottendo/v2.0-work/vice/src/arch/win32/vsyncarch.c
===================================================================
--- branches/pottendo/v2.0-work/vice/src/arch/win32/vsyncarch.c	2008-08-02 20:17:19 UTC (rev 19105)
+++ branches/pottendo/v2.0-work/vice/src/arch/win32/vsyncarch.c	2008-08-02 20:18:34 UTC (rev 19106)
@@ -141,47 +141,12 @@
     ui_display_speed((float) speed, (float)frame_rate, warp_enabled);
 }
 
-static unsigned long last = 0;
-static unsigned long nosynccount = 0;
-
-void vsyncarch_verticalblank(video_canvas_t *c, float rate, int frames)
+void vsyncarch_sync_with_raster(video_canvas_t *c)
 {
-    unsigned long nowi, lastx, max, frm, vbl;
-
-    if (c->refreshrate <= 0.0f)
-        return;
-
-    nowi = vsyncarch_frequency();
-
-    /* calculate counter cycles per frame */
-    frm = (unsigned long)((float)(nowi * frames) / rate);
-
-    nowi = vsyncarch_gettime();
-
-    lastx = last - (frm * nosynccount);
-    max = (frm * 7) >> 3;
-    vbl = 0;
-    while (max >= (nowi - lastx)) {
-        IDirectDraw2_WaitForVerticalBlank(c->dd_object2, DDWAITVB_BLOCKBEGIN,
-                                          0);
-        nowi = vsyncarch_gettime();
-        vbl = 1;
-    }
-    if ((!vbl) && (nosynccount < 16)) {
-        nosynccount ++;
-    } else {
-        last = nowi;
-        nosynccount = 0;
-    }
+    IDirectDraw2_WaitForVerticalBlank(c->dd_object2, DDWAITVB_BLOCKBEGIN,
+				      0);
 }
 
-void vsyncarch_prepare_vbl(void)
-{
-    /* keep vertical blank data prepared */
-    last = vsyncarch_gettime();
-    nosynccount = 0;
-}
-
 void vsyncarch_sleep(signed long delay)
 {
     unsigned long start, now;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19105] branches/pottendo/v2.0-work/vice/src/arch/unix /x11/xrandr.c

From: <pot...@us...> - 2008-08-02 20:17:11

Revision: 19105
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19105&view=rev
Author:   pottendo
Date:     2008-08-02 20:17:19 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
(all): Removed kludge `mult'.
(all): save current refresh rate in canvas.

Modified Paths:
--------------
    branches/pottendo/v2.0-work/vice/src/arch/unix/x11/xrandr.c

Modified: branches/pottendo/v2.0-work/vice/src/arch/unix/x11/xrandr.c
===================================================================
--- branches/pottendo/v2.0-work/vice/src/arch/unix/x11/xrandr.c	2008-08-02 20:12:45 UTC (rev 19104)
+++ branches/pottendo/v2.0-work/vice/src/arch/unix/x11/xrandr.c	2008-08-02 20:17:19 UTC (rev 19105)
@@ -48,14 +48,13 @@
 #include "openGL_sync.h"
 #endif
 
-int mult = 1;
-
 static log_t xrandr_log = LOG_ERR;
 static int no_xrandr = 1;
 static int xrandr_active = 0;
 static int xrandr_selected_mode = 0;
 static ui_callback_t menu_callback;
 static ui_menu_entry_t *resolutions_submenu;
+static struct video_canvas_s *current_canvas;
 
 static int init_XRandR(Display *dpy);
 static int set_xrandr(int mode);
@@ -96,6 +95,7 @@
 	log_message(xrandr_log, "Selected mode: %s", 
 		    screen_info.all_modes[mode].mode_string);
     xrandr_selected_mode = mode;
+    current_canvas = canvas;
     
     return 0;
 }
@@ -254,7 +254,7 @@
 	screen_info.all_modes[current].index = screen_info.current_size;
 	screen_info.all_modes[current].mode_string = 
 	    lib_stralloc(_("*Desktop"));
-	
+	current_canvas->refreshrate = (float)screen_info.current_rate;
 	++current;
 	
 	/* now iterate again and fill the allocated array */
@@ -307,13 +307,8 @@
 	    log_message(xrandr_log, "XRandR setting failed: %d", status);
 	else
 	{
-	    switch (screen_info.all_modes[xrandr_selected_mode].rate)
-	    {
-	    case 100: mult = 2; break;
-	    case 150: mult = 3; break;
- 	    case 50: 
-	    default: mult = 1; break;
-	    }
+	    current_canvas->refreshrate = 
+		screen_info.all_modes[xrandr_selected_mode].rate;
 #ifdef HAVE_OPENGL_SYNC	    
 	    init_openGL();
 #endif
@@ -331,7 +326,10 @@
 				      0);
 	if (status)
 	    log_message(xrandr_log, "XRandR setting failed: %d", status);
-	mult = 1;
+	else
+	    current_canvas->refreshrate = 
+		screen_info.all_modes[0].rate;
+
     }
 	
     ui_update_menus();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19104] branches/pottendo/v2.0-work/vice/src/arch/unix /x11/xaw/x11video.c

From: <pot...@us...> - 2008-08-02 20:12:39

Revision: 19104
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19104&view=rev
Author:   pottendo
Date:     2008-08-02 20:12:45 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Removed call to `openGL_sync_with_raster()'.

Modified Paths:
--------------
    branches/pottendo/v2.0-work/vice/src/arch/unix/x11/xaw/x11video.c

Modified: branches/pottendo/v2.0-work/vice/src/arch/unix/x11/xaw/x11video.c
===================================================================
--- branches/pottendo/v2.0-work/vice/src/arch/unix/x11/xaw/x11video.c	2008-08-02 20:12:05 UTC (rev 19103)
+++ branches/pottendo/v2.0-work/vice/src/arch/unix/x11/xaw/x11video.c	2008-08-02 20:12:45 UTC (rev 19104)
@@ -930,9 +930,6 @@
     /* This could be optimized away.  */
     display = x11ui_get_display_ptr();
 
-#ifdef HAVE_OPENGL_SYNC
-    openGL_sync_with_raster();
-#endif
     _refresh_func(display, canvas->drawable, _video_gc, canvas->x_image,
                   xi, yi, xi, yi, w, h, False, NULL, canvas);
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19103] branches/pottendo/v2.0-work/vice/src/arch/unix /x11/xaw/videoarch.h

From: <pot...@us...> - 2008-08-02 20:11:57

Revision: 19103
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19103&view=rev
Author:   pottendo
Date:     2008-08-02 20:12:05 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Add member `refreshrate' to struct canvas.

Modified Paths:
--------------
    branches/pottendo/v2.0-work/vice/src/arch/unix/x11/xaw/videoarch.h

Modified: branches/pottendo/v2.0-work/vice/src/arch/unix/x11/xaw/videoarch.h
===================================================================
--- branches/pottendo/v2.0-work/vice/src/arch/unix/x11/xaw/videoarch.h	2008-08-02 20:11:28 UTC (rev 19102)
+++ branches/pottendo/v2.0-work/vice/src/arch/unix/x11/xaw/videoarch.h	2008-08-02 20:12:05 UTC (rev 19103)
@@ -77,6 +77,7 @@
     Colormap colormap;
     XImage *x_image;
     unsigned int depth;
+    float refreshrate;
 #ifdef HAVE_XVIDEO
     XvImage *xv_image;
     XvPortID xv_port;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19102] branches/pottendo/v2.0-work/vice/src/arch/unix /x11/openGL_sync.c

From: <pot...@us...> - 2008-08-02 20:11:19

Revision: 19102
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19102&view=rev
Author:   pottendo
Date:     2008-08-02 20:11:28 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Removed kludge `mult'
New function `openGL_synce_enabled()'.

Modified Paths:
--------------
    branches/pottendo/v2.0-work/vice/src/arch/unix/x11/openGL_sync.c

Modified: branches/pottendo/v2.0-work/vice/src/arch/unix/x11/openGL_sync.c
===================================================================
--- branches/pottendo/v2.0-work/vice/src/arch/unix/x11/openGL_sync.c	2008-08-02 20:10:29 UTC (rev 19101)
+++ branches/pottendo/v2.0-work/vice/src/arch/unix/x11/openGL_sync.c	2008-08-02 20:11:28 UTC (rev 19102)
@@ -45,13 +45,6 @@
 #include "uimenu.h"
 #include "lib.h"
 
-/* Fixme: this is a kludge until vsync inclusion is decided */
-#ifdef HAVE_XRANDR
-extern int mult;
-#else
-static int mult = 1;
-#endif
-
 static log_t openGL_log = LOG_ERR;
 static int no_sync = 0;		/* extension available */
 static int openGL_sync;		/* enabled/disable synchronization */
@@ -109,10 +102,16 @@
     int r;
     unsigned int c;
     if (openGL_sync && !no_sync)
-	if ((r = glXWaitVideoSyncSGI(mult, 0, &c)))
+	if ((r = glXWaitVideoSyncSGI(1, 0, &c)))
 	    log_error(openGL_log, "glXWaitVideoSyncSGI() returned %d", r);
 }
 
+int
+openGL_sync_enabled()
+{
+    return openGL_sync;
+}
+
 void
 openGL_sync_shutdown(void)
 {
@@ -204,7 +203,6 @@
 
     log_message(openGL_log, "%s openGL_sync", 
 		openGL_sync? "enabling" : "disabling");
-	
     ui_update_menus();
     return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19101] branches/pottendo/v2.0-work/vice/src/arch/unix /x11/gnome/videoarch.h

From: <pot...@us...> - 2008-08-02 20:10:22

Revision: 19101
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19101&view=rev
Author:   pottendo
Date:     2008-08-02 20:10:29 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Add member `refreshrate' to struct canvas.

Modified Paths:
--------------
    branches/pottendo/v2.0-work/vice/src/arch/unix/x11/gnome/videoarch.h

Modified: branches/pottendo/v2.0-work/vice/src/arch/unix/x11/gnome/videoarch.h
===================================================================
--- branches/pottendo/v2.0-work/vice/src/arch/unix/x11/gnome/videoarch.h	2008-08-02 20:09:21 UTC (rev 19100)
+++ branches/pottendo/v2.0-work/vice/src/arch/unix/x11/gnome/videoarch.h	2008-08-02 20:10:29 UTC (rev 19101)
@@ -54,6 +54,7 @@
     struct viewport_s *viewport;
     struct geometry_s *geometry;
     struct palette_s *palette;
+    float refreshrate; /* currently displayed refresh rate */
 
     struct video_draw_buffer_callback_s *video_draw_buffer_callback;
 #ifdef HAVE_FULLSCREEN


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19100] branches/pottendo/v2.0-work/vice/src/arch/unix /x11/gnome/gnomevideo.c

From: <pot...@us...> - 2008-08-02 20:09:13

Revision: 19100
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19100&view=rev
Author:   pottendo
Date:     2008-08-02 20:09:21 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Remove call to `openGL_sync_with_raster()'

Modified Paths:
--------------
    branches/pottendo/v2.0-work/vice/src/arch/unix/x11/gnome/gnomevideo.c

Modified: branches/pottendo/v2.0-work/vice/src/arch/unix/x11/gnome/gnomevideo.c
===================================================================
--- branches/pottendo/v2.0-work/vice/src/arch/unix/x11/gnome/gnomevideo.c	2008-08-02 20:08:30 UTC (rev 19099)
+++ branches/pottendo/v2.0-work/vice/src/arch/unix/x11/gnome/gnomevideo.c	2008-08-02 20:09:21 UTC (rev 19100)
@@ -210,10 +210,6 @@
                         canvas->gdk_image_size.width*3,
                         24);
 
-
-#ifdef HAVE_OPENGL_SYNC
-    openGL_sync_with_raster();
-#endif
     /* Schedule redraw of the rendered area. */
     {
         GdkRectangle rect = {xi, yi, w, h};


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19099] branches/pottendo/v2.0-work/vice/src/arch/unix /vsyncarch.c

From: <pot...@us...> - 2008-08-02 20:08:22

Revision: 19099
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19099&view=rev
Author:   pottendo
Date:     2008-08-02 20:08:30 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
New functions to implement better vsync/vblank (as it's done in the
win32 port).

Modified Paths:
--------------
    branches/pottendo/v2.0-work/vice/src/arch/unix/vsyncarch.c

Modified: branches/pottendo/v2.0-work/vice/src/arch/unix/vsyncarch.c
===================================================================
--- branches/pottendo/v2.0-work/vice/src/arch/unix/vsyncarch.c	2008-08-02 20:07:26 UTC (rev 19098)
+++ branches/pottendo/v2.0-work/vice/src/arch/unix/vsyncarch.c	2008-08-02 20:08:30 UTC (rev 19099)
@@ -30,10 +30,14 @@
 #include "kbdbuf.h"
 #include "ui.h"
 #include "vsyncapi.h"
+#include "videoarch.h"
 
 #ifdef HAS_JOYSTICK
 #include "joy.h"
 #endif
+#ifdef HAVE_OPENGL_SYNC
+#include "openGL_sync.h"
+#endif
 
 #include <sys/time.h>
 #include <unistd.h>
@@ -101,3 +105,18 @@
     (*ui_dispatch_hook)();
 #endif
 }
+
+#ifdef HAVE_OPENGL_SYNC
+void
+vsyncarch_sync_with_raster(video_canvas_t *c)
+{
+    openGL_sync_with_raster();
+}
+
+int 
+vsyncarch_vbl_sync_enabled(void)
+{
+    return openGL_sync_enabled();
+}
+
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19098] branches/pottendo/v2.0-work/vice/src/arch/unix /openGL_sync.h

From: <pot...@us...> - 2008-08-02 20:07:19

Revision: 19098
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19098&view=rev
Author:   pottendo
Date:     2008-08-02 20:07:26 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
New Prototype for `openGL_sync_enabled()'.

Modified Paths:
--------------
    branches/pottendo/v2.0-work/vice/src/arch/unix/openGL_sync.h

Modified: branches/pottendo/v2.0-work/vice/src/arch/unix/openGL_sync.h
===================================================================
--- branches/pottendo/v2.0-work/vice/src/arch/unix/openGL_sync.h	2008-08-02 15:59:30 UTC (rev 19097)
+++ branches/pottendo/v2.0-work/vice/src/arch/unix/openGL_sync.h	2008-08-02 20:07:26 UTC (rev 19098)
@@ -36,5 +36,6 @@
 int openGL_available(int val);
 void init_openGL(void);
 void openGL_register_resources(void);
+int openGL_sync_enabled(void);
 
 #endif /* __openGL_sync_h__ */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19097] branches/viceplus/v2.0-x64dtv/vice/src/arch/ unix/gui/uic64dtv.c

From: <pot...@us...> - 2008-08-02 15:59:22

Revision: 19097
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19097&view=rev
Author:   pottendo
Date:     2008-08-02 15:59:30 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
UI_CALLBACK(set_c64dtv_rom_name):
Make use of `ui_select_file(...)' for dtvrom selection.

Modified Paths:
--------------
    branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uic64dtv.c

Modified: branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uic64dtv.c
===================================================================
--- branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uic64dtv.c	2008-08-02 04:32:39 UTC (rev 19096)
+++ branches/viceplus/v2.0-x64dtv/vice/src/arch/unix/gui/uic64dtv.c	2008-08-02 15:59:30 UTC (rev 19097)
@@ -40,8 +40,29 @@
 
 UI_CALLBACK(set_c64dtv_rom_name)
 {
-    uilib_select_string((char *)UI_MENU_CB_PARAM, _("C64DTV ROM image name"),
-                        _("Name:"));
+    char *filename;
+    ui_button_t button;
+    static char *last_dir;
+
+    filename = ui_select_file(_("C64DTV ROM image name"),
+			      NULL, 0, 0, last_dir,
+			      "*.[bB][iI][nN]",
+			      &button, 0, NULL);
+
+    switch (button) {
+    case UI_BUTTON_OK:
+	resources_set_string("c64dtvromfilename", filename);
+	if (last_dir)
+	    lib_free(last_dir);
+	util_fname_split(filename, &last_dir, NULL);
+	break;
+    default:
+	/* Do nothing special. */
+	break;
+    }
+    if (filename != NULL)
+	lib_free(filename);
+
 }
 
 static ui_menu_entry_t c64dtv_revision_submenu[] = {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Vice-emu-commit] SF.net SVN: vice-emu:[19096] branches/marco/ports/vice

From: <bla...@us...> - 2008-08-02 04:32:34

Revision: 19096
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=19096&view=rev
Author:   blackystardust
Date:     2008-08-02 04:32:39 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Updated to 2.0

Modified Paths:
--------------
    branches/marco/ports/vice/ChangeLog
    branches/marco/ports/vice/build/macosx/build-vice-release.sh
    branches/marco/ports/vice/configure.in
    branches/marco/ports/vice/doc/ReadmeMacOSX.txt
    branches/marco/ports/vice/doc/Win32-Cygwin-HOWTO.txt
    branches/marco/ports/vice/doc/html/index.html
    branches/marco/ports/vice/doc/html/macosx.html
    branches/marco/ports/vice/doc/html/plain/NEWS
    branches/marco/ports/vice/doc/vice.texi
    branches/marco/ports/vice/po/ChangeLog
    branches/marco/ports/vice/po/de.po
    branches/marco/ports/vice/po/fr.po
    branches/marco/ports/vice/po/hu.po
    branches/marco/ports/vice/po/it.po
    branches/marco/ports/vice/po/nl.po
    branches/marco/ports/vice/po/pl.po
    branches/marco/ports/vice/po/sv.po
    branches/marco/ports/vice/src/ChangeLog
    branches/marco/ports/vice/src/arch/amigaos/intl.c
    branches/marco/ports/vice/src/arch/unix/gui/uipalemu.c
    branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m
    branches/marco/ports/vice/src/arch/unix/macosx/cocoa/video.m
    branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c
    branches/marco/ports/vice/src/arch/win32/res.rc
    branches/marco/ports/vice/src/arch/win32/resc128.rc
    branches/marco/ports/vice/src/arch/win32/resc64.rc
    branches/marco/ports/vice/src/arch/win32/rescbm2.rc
    branches/marco/ports/vice/src/arch/win32/respet.rc
    branches/marco/ports/vice/src/arch/win32/resplus4.rc
    branches/marco/ports/vice/src/arch/win32/resvic20.rc
    branches/marco/ports/vice/src/c64/tfe.c
    branches/marco/ports/vice/src/translate.c
    branches/marco/ports/vice/src/version.h

Modified: branches/marco/ports/vice/ChangeLog
===================================================================
--- branches/marco/ports/vice/ChangeLog	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/ChangeLog	2008-08-02 04:32:39 UTC (rev 19096)
@@ -1,3 +1,20 @@
+2008-07-18  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 2.0
+
+2008-07-18  Christian Vogelgsang  <ch...@vo...>
+
+	* build/macosx/build-vice-release.sh: use provided autogen.sh
+
+	* doc/ReadmeMacOSX.txt: updated mac docs
+
+	* doc/html/macosx.html: Prepared for release of 2.0
+
+2008-07-17  Spiro Trikaliotis  <spi...@gm...>
+
+	* doc/vice.texi, doc/html/plain/NEWS, doc/html/index.html,
+	doc/Win32-Cygwin-HOWTO.txt: Prepared for upcoming 2.0 release.
+
 2008-07-16  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.27

Modified: branches/marco/ports/vice/build/macosx/build-vice-release.sh
===================================================================
--- branches/marco/ports/vice/build/macosx/build-vice-release.sh	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/build/macosx/build-vice-release.sh	2008-08-02 04:32:39 UTC (rev 19096)
@@ -96,13 +96,8 @@
 
 # configure snapshot
 echo "configuring new source tree"
-(cd "$SRC_DIR/src/resid" && aclocal && automake && autoconf) >/dev/null 2>&1 
+(cd "$SRC_DIR" && ./autogen.sh)
 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

Modified: branches/marco/ports/vice/configure.in
===================================================================
--- branches/marco/ports/vice/configure.in	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/configure.in	2008-08-02 04:32:39 UTC (rev 19096)
@@ -7,15 +7,15 @@
 
 AC_INIT(src/maincpu.c)
 
-VICE_VERSION_MAJOR=1
-VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=27
+VICE_VERSION_MAJOR=2
+VICE_VERSION_MINOR=0
+VICE_VERSION_BUILD=0
 
 AC_SUBST(VICE_VERSION_MAJOR)
 AC_SUBST(VICE_VERSION_MINOR)
 AC_SUBST(VICE_VERSION_BUILD)
 
-AC_DEFINE(UNSTABLE,,[Define if this version is unstable.])
+dnl AC_DEFINE(UNSTABLE,,[Define if this version is unstable.])
 
 if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then
   VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR

Modified: branches/marco/ports/vice/doc/ReadmeMacOSX.txt
===================================================================
--- branches/marco/ports/vice/doc/ReadmeMacOSX.txt	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/doc/ReadmeMacOSX.txt	2008-08-02 04:32:39 UTC (rev 19096)
@@ -1,9 +1,9 @@
-MacOS X Port of VICE
+Mac OS X Port of VICE
 ====================
 
 This document contains information relevant for the Mac OS X Port of VICE.
 
-This official MacOS X Port is maintained by 
+This official Mac OS X Port is maintained by 
   Christian Vogelgsang <ch...@vo...>
 
 
@@ -11,35 +11,48 @@
   --------
 
   1. Installation
-  2. Usage
-  3. Building VICE
-  4. Feedback
+  2. Usage of Gtk+/X11 Port
+  3. Usage of Cocoa Port
+  4. Joystick Support
+  5. Building VICE
+  6. Feedback
 
 
 1. Installation
 ---------------
 
-1.1 Install X11
 
-Make sure to have X11.app installed on your Mac. It is provided on your Mac
+1.1 Choose Port
+
+The VICE Emulators for Macs are distributed in three versions that use
+different UI front ends: native Cocoa, X11/Xaw, and, Gtk+. The first one
+directly uses the well known Mac user interface. The other ones are based on
+the X11 Window System that is available additionally for Mac OS X.
+
+X11/Xaw is based on the original X11 interface of VICE and is very light but
+with limited UI interface. The second one is based on the Gtk+ widget library
+and has a feature rich UI with pull-down menus. Xaw is a slim port that needs
+no non-system extra libraries, Gtk+ requires a large set of external libs and
+thus is quite large.
+
+The ports are named with *-cocoa-*, *-x11-*, or *-gtk-* in the distribution
+archive name.
+
+The X11/Xaw and Gtk+ are complete ports, i.e. all features available on other
+systems are available and all emulators are included. The Cocoa port is still
+under construction and thus considered "experimental". It does not include all
+features available and some emulators are not complete.
+
+
+1.2 Install X11 (Only for X11/Xaw and Gtk+ Port)
+
+Make sure you have X11.app installed on your Mac. It is provided on your Mac
 OSX install CD/DVD (at least on Mac OS X 10.4 or later) and often not
 installed by default. Click on the corresponding "X11.pkg" to install it. On
 newer systems there is an "Optional Installs.pkg" installer that allows to
 install X11 in the "Custom Installation" section.
 
-1.2 Choose Version
 
-The VICE Emulators for Macs are distributed in two versions that use different
-UI front ends: X11 or Gtk+. The first one is based on the original X11
-interface of VICE and is very light. The second one is based on the Gtk+
-widget library and has a feature rich UI with pull-down menus.
-
-X11 is a slim port that needs no non-system extra libraries, Gtk+ requires a
-large set of external libs and thus is quite large.
-
-The two ports are named with *-x11-* or *-gtk-* in the distribution archive
-name.
-
 1.3 Install Application
 
 The Mac OS X port is distributed as a disk image *.dmg. Just click on the
@@ -47,8 +60,11 @@
 disk image to your hard disk. Just create a new VICE directory in your
 applications folder (/Applications) and copy all files there.
 
-1.4 Create Bundles for each Emulator
+If you like, you can move the Application binaries anywhere you want.
 
+
+1.4 Create Bundles for each Emulator (Optional; Only for X11/Xaw and Gtk+ Port)
+
 The VICE distribution contains a single application bundle called VICE. If you
 run this one by double clicking on it then it will ask which emulator to run.
 
@@ -61,6 +77,7 @@
 The separate emulator application bundles are not distributed in the release
 dmg to save download time and server space.
 
+
 1.5 Setup Command Line Tools
 
 You can use the emulators and some additional tools (e.g. c1541, cardconv,
@@ -73,8 +90,10 @@
 The command line emulators are launched with a helper script that calls the
 binary embedded in the VICE.app application bundle. It is important to keep
 the VICE.app bundle in the directory directly next to the "tools" directory
-otherwise the command line emulators will not run.
+otherwise the command line emulators will not run. Similarly, the Cocoa port
+needs the emulator App bundle in the same directory.
 
+
 1.6 Network Setup
 
 This port of VICE supports the ethernet emulation available in some emulators
@@ -98,10 +117,15 @@
 libpcap-source distribution. Download from http://www.tcpdump.org and have a
 look at libpcap/README.macosx.
 
+Unfortunately, the WLAN adapter (usually device en1) on portable Macs does not
+support libpcap packet capturing (as of 10.4 and 10.5). So TFE emulation on a
+wireless network adapter may not work. Use the ethernet port instead.
 
-2. Usage
---------
 
+
+2. Usage of Gtk+ and X11/Xaw Ports
+----------------------------------
+
 2.1 Run VICE Bundle
 
 Simply run the emulator suite by clicking on the VICE.app icon. A chooser
@@ -109,15 +133,19 @@
 to launch an emulator directly then see section 1.4 for creating separate
 bundles for each emulator.
 
-The VICE Bundle supports a simple style of drag and drop: You can launch the
+On start up the bundle will first open a terminal window (xterm) for the VICE
+log messages and then the screen windows for the virtual displays.
+
+The VICE bundles support a simple style of drag and drop: You can launch the
 emulator by dragging a disk image (*.d64 *.d71 *.d81) or a program file (*.prg
 *.p00) on the bundle icon. This will smart-attach the given binary and launch
 the emulator. If the emulator is already running then drag and drop does not
 work.
 
-On start up the bundle will first open a terminal window (xterm) for the VICE
-log messages and then the screen windows for the virtual displays.
+Also, an emulator bundle will register the typical file types (see above) and
+then you can simply click on a disk image directly to launch it in VICE.
 
+
 2.2 Run from Command Line
 
 First add the "tools" directory to your PATH (see section 1.5) in your
@@ -125,10 +153,11 @@
 script in "tools" (e.g. x64, x128...). Any arguments passed to the launcher
 are directly forwarded to the emulator binary.
 
-On start up the launcher ensures that the X11 environment is available and
-redirects all console output directly to the console. An additional xterm
-window for log messages is not opened.
+For the Gtk+ and X11/Xaw ports on start up the launcher ensures that the X11
+environment is available and redirects all console output directly to the
+console. An additional xterm window for log messages is not opened.
 
+
 2.3 Use the X11 UI
 
 The X11 UI is very light and only presents the virtual display in a window
@@ -151,6 +180,7 @@
 Have a look at the official VICE manuals for an in-depth description of the
 available commands and options.
 
+
 2.4 Use the Gtk+ UI
 
 The Gtk+ UI is much more user-friendly. An emulator window with a pull-down
@@ -164,8 +194,9 @@
 Have a look at the official VICE manuals for an in-depth description of the
 available commands and options.
 
-2.5 Keyboard Mapping
 
+2.5 Keyboard Mapping in Gtk+/X11
+
 The keyboard mapping on X11 (and on your Mac) is done as follows:
  
  1. Map raw key code of your keyboard to X11 key code with Xmodmap
@@ -183,7 +214,7 @@
 choosing a file or by selecting a predefined one. Predefined symbolic and
 positional mappings are available.
 
-The symbolic mapping assigns the pressed Mac key to the same labeled key on
+The 'symbolic mapping' assigns the pressed Mac key to the same labeled key on
 the virtual cbm keyboard. So pressing F1 on the Mac presses F1 on the emulated
 machine. It also does automatic shifting/unshifting, e.g. pressing F2 on the
 Mac results in a virtual shift press and a virtual key F1 press (i.e. F2 is
@@ -205,12 +236,12 @@
    Left Arrow                Underscore (_)               
    Up Arrow                  Tilde (~) Backtick (`) Grave (^)
 
-The positional mappings try to map the physical location of a key on the Mac
+The 'positional mappings' try to map the physical location of a key on the Mac
 keyboard to a virtual key at a similar position. E.g. your top and leftmost
 key will be the top and leftmost key on your virtual machine. Unfortunately,
 this mapping does not work always as expected: It relies heavily on the
 national layout of your keymap. Furthermore, the physical layout of Mac and
-VICE machine do not match exactly so positional mapping will always be an
+VICE machine do not match exactly, so positional mapping will always be an
 approximation. This can be even more complicate if you use different key
 mappings on your Mac.
 
@@ -220,8 +251,56 @@
 keys to control software features". The hardware controls are then accessed by
 pressing F1-F12 + Fn key.
 
-2.6 Joystick Support
 
+
+3. Usage of Cocoa Port
+----------------------
+
+Note: The Cocoa port is still "experimental", i.e. it is not full featured and
+some things may be missing. This holds for the documentation as well ;)
+
+3.1 Features
+
+ * native Mac OS X user interface with modeless dialogs
+ * any-size/fullscreen OpenGL accelerated rendering
+ * multi-threaded emulation core
+
+
+3.2 Current State
+
+ * x64 90% complete, runs with UI and most menus and dialogs.
+ 
+ * All other emus: binaries are available, no menus and dialogs.
+   Use CMD+Q to quit such an emulator and drag&drop to attach disk images.
+   Some keyboard mappings already work, others not.
+
+
+3.3 Known Issues
+
+ * The Resource Inspector lacks correct input cells. All values have to
+   be entered as strings.
+ * Some Menu entries are not greyed out but still do nothing.
+
+
+3.4 Key Mapping
+
+The key mapping show the Mac key on a US extended mapping and the right one is
+the emulated Commodore key. Special keys are marked with <Symbol>.
+
+  § (Paragraph)                 <LEFT ARROW>
+  <Tab>                         <CONTROL>
+  ` (Backtick), Left Alt/Ctrl   <CBM>
+  <ESC>                         <RUN/STOP>
+  <Backspace>                   <DEL>
+  <F9>, <PgDown>                <POUND>
+  <F10>, <PgUp>                 <UP ARROW>
+  <F11>, <Home>                 <CLR/HOME>
+  <F12>                         <RESTORE>
+
+
+4. Joystick Support
+-------------------
+
 The Mac ports has support for USB joysticks. It requires a generic USB HID
 joystick device which is supported by most joystick models. Every button of
 the joystick is mapped to the single virtual fire button in the emulator. The
@@ -242,14 +321,15 @@
 should work with other models as well.
 
 
-3. Building VICE
+5. Building VICE
 ----------------
 
 This section is only relevant if you want to compile an own distribution of
 VICE from the source code.
 
-3.1 XCode
 
+5.1 XCode
+
 If you wan to compile VICE yourself then you first need to install Apple's
 XCode Development kit. It is available on your Mac OS X Installation DVD or
 can be downloaded for free (after registration) from the Apple Developer
@@ -260,10 +340,11 @@
 XCode itself is not required but the command line tools (compiler, linker...)
 and other development files (SDKs).
 
-3.2 Required Tools
 
-The following tools are required or optional for a successfull VICE build:
+5.2 Required Tools
 
+The following tools are required or optional for a successful VICE build:
+
  - Platypus  (Optional)
    
      http://www.sveinbjorn.org/platypus
@@ -276,8 +357,9 @@
    script does not support drag and drop and quits immediately afert start up
    (i.e. the VICE application icon disappears after the launch)!
 
-3.3 Required Library Sources
 
+5.3 Required Library Sources
+
 VICE for Macs relies on a number of external libraries. You have to get their
 source code as they are missing on a default Mac system. Some libs are
 optional, i.e. if they are available then some extra features of VICE are
@@ -317,8 +399,9 @@
     lame-3.97.tar.gz            http://lame.sourceforge.net/
     svn tree at                 svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-svn
 
-3.4 Building Required Libraries
 
+5.4 Building Required Libraries
+
 First, build all external libraries. The VICE source distribution contains
 build scripts to automatically perform this step.
 
@@ -342,8 +425,9 @@
 If all went well then the libraries are compiled and installed in the "extlib"
 directory. The libraries are now ready for the VICE build.
 
-3.5 Building VICE
 
+5.5 Building VICE
+
 The build process of VICE contains the following steps: Call "configure" in
 the source tree to determine the required "make" system setup and find
 available libs. Then compile the source tree to get binaries of all emulators
@@ -399,7 +483,7 @@
 disk image found in the "TEMP/x11/ub/" directory.
 
 
-4. Feedback
+6. Feedback
 -----------
 
 If you discover problems not listed above or just want to tell us your

Modified: branches/marco/ports/vice/doc/Win32-Cygwin-HOWTO.txt
===================================================================
--- branches/marco/ports/vice/doc/Win32-Cygwin-HOWTO.txt	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/doc/Win32-Cygwin-HOWTO.txt	2008-08-02 04:32:39 UTC (rev 19096)
@@ -13,7 +13,7 @@
    dependencies.
 
 2. Obtain a copy of the VICE sources.  Extract the vice-x.xx directory into
-   your Cygwin user's home directory (e.g. /home/Owner/vice-1.22).
+   your Cygwin user's home directory (e.g. /home/Owner/vice-2.0).
 
 3. Obtain DirectX 7 header files and libraries.  It doesn't look like
    Microsoft still makes this distribution available for download from its
@@ -46,7 +46,7 @@
      make bindist
 
    to make an executable distribution, which will appear in a directory
-   called e.g. /home/Owner/vice-1.22/src/WinVICE-1.22.  For development
+   called e.g. /home/Owner/vice-2.0/src/WinVICE-2.0.  For development
    purposes, no further installation is necessary; you can run the
    executables directly from this directory.
 

Modified: branches/marco/ports/vice/doc/html/index.html
===================================================================
--- branches/marco/ports/vice/doc/html/index.html	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/doc/html/index.html	2008-08-02 04:32:39 UTC (rev 19096)
@@ -461,6 +461,11 @@
 <a NAME="contact">Contacts
 </h1>
 
+<p>VICE has moved its source repository to public services provided by
+<a href="http://sf.net/">SourceForge</a>. You can find it at <a
+href="http://sf.net/projects/vice-emu">http://sf.net/projects/vice-emu</a>.
+We like to thank the SourceForge staff for that help.</p>
+
 <p>Before contacting us, have a look at the
 <a href="http://vicekb.trikaliotis.net/">VICE knowledge base</a> if your
 question is answered there. Keep in mind
@@ -473,8 +478,13 @@
 <ul>
 
 <li>
-Generic questions, bug reports, suggestions etc.: The Vice team
-(<a href="mailto:vic...@fi...">vic...@fi...</a>)
+Bug reports, suggestions, support requests should be directed to the
+SourceForge trackers at <a
+	href="http://sourceforge.net/tracker/?group_id=223021">http://sourceforge.net/tracker/?group_id=223021</a>.
+This way, you, the users, and we, the developers, can track what has
+been reported and what has been already fixed. Ideally, also sent the
+report to the mailing address of the Vice team at (<a
+	href="mailto:vic...@fi...">vic...@fi...</a>).
 </li>
 
 </ul>

Modified: branches/marco/ports/vice/doc/html/macosx.html
===================================================================
--- branches/marco/ports/vice/doc/html/macosx.html	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/doc/html/macosx.html	2008-08-02 04:32:39 UTC (rev 19096)
@@ -43,7 +43,7 @@
 On Intel Macs: Requires at least Mac OS X <b>10.4</b>
 </li>
 <li>
-<b>X11.app</b> Version 1.0 from Extra Installs on Mac OS X DVD
+<b>X11.app</b> Version 1.0 from Extra Installs on Mac OS X DVD for X11 and Gtk+ port.
 </li>
 </ul>
     
@@ -56,7 +56,7 @@
 <ul>
 <li>
 Tarball:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-1.22.tar.gz">vice-1.22.tar.gz</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0.tar.gz">vice-2.0.tar.gz</a>
 </li>
 </ul>
 
@@ -70,12 +70,12 @@
 
 <li>
 Universal Binary for <b>X11 Athena Widgets UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.22.dmg">vice-macosx-x11-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-2.0.dmg">vice-macosx-x11-ub-2.0.dmg</a>
 </li>
 
 <li>
 Universal Binary for <b>X11 Gtk+ UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-2.0.dmg">vice-macosx-gtk-ub-2.0.dmg</a>
 </li>
 
 </ul>
@@ -87,7 +87,7 @@
 <ul>
 <li>
 Universal Binary for <b>native Cocoa UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-1.22.dmg">vice-macosx-cocoa-ub-1.22.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-2.0.dmg">vice-macosx-cocoa-ub-2.0.dmg</a>
 <p><b>Note:</b> The Cocoa Port is not complete yet. The archive contains a runnable x64 with a subset of the upcoming features.
 This binary is a technical preview of the new port and no full featured release of VICE. Please choose the X11/Athena or X11/Gtk+ port
 for a complete Mac release.</p>
@@ -102,14 +102,20 @@
 
 <li>
 Universal Binary for <b>X11 Athena Widgets UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.21.dmg">vice-macosx-x11-ub-1.21.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-x11-ub-1.22.dmg">vice-macosx-x11-ub-1.22.dmg</a>
 </li>
 
 <li>
 Universal Binary for <b>X11 Gtk+ UI</b>:
-<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.21.dmg">vice-macosx-gtk-ub-1.21.dmg</a>
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-gtk-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
 </li>
 
+<li>
+Universal Binary for <b>native Cocoa UI</b>:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-macosx-cocoa-ub-1.22.dmg">vice-macosx-gtk-ub-1.22.dmg</a>
+
+</li>
+
 </ul>
 
 The files are taken from

Modified: branches/marco/ports/vice/doc/html/plain/NEWS
===================================================================
--- branches/marco/ports/vice/doc/html/plain/NEWS	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/doc/html/plain/NEWS	2008-08-02 04:32:39 UTC (rev 19096)
@@ -11,6 +11,12 @@
 ** General
 ----------
 
+- VICE development has moved to public services:
+  http://sf.net/projects/vice-emu
+  You can read the latest development in the Subversion
+  repository, file bug reports, and similar things.
+  Check it out!
+
 - New Openserver 5.x, Openserver 6.x and Unixware ports.
 
 - New AROS64 port.
@@ -51,6 +57,9 @@
   NTSC sprites and sprites in full/debugging border mode (list
   of fixed demos/games too long to mention here).
 
+- RESTORE key is handled differently now, fixing an NMI bug
+  because the NMI was asserted too long before.
+
 ** VIC20 changes
 ----------------
 
@@ -111,6 +120,9 @@
 
 - Fixed volume slider behaviour when switching fullscreen mode.
 
+- Key repeat is eliminated OS-wise. This way, the RESTORE key is
+  not used with autorepeat.
+
 ** BeOS changes
 ---------------
 

Modified: branches/marco/ports/vice/doc/vice.texi
===================================================================
--- branches/marco/ports/vice/doc/vice.texi	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/doc/vice.texi	2008-08-02 04:32:39 UTC (rev 19096)
@@ -99,7 +99,7 @@
 
 @ifinfo
 
-This is the documentation for version 1.20 of VICE, the Versatile
+This is the documentation for version 2.0 of VICE, the Versatile
 Commodore Emulator.
 
 @end ifinfo

Modified: branches/marco/ports/vice/po/ChangeLog
===================================================================
--- branches/marco/ports/vice/po/ChangeLog	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/po/ChangeLog	2008-08-02 04:32:39 UTC (rev 19096)
@@ -1,3 +1,25 @@
+2008-07-18  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 2.0
+
+2008-07-18  Spiro Trikaliotis  <spi...@gm...>
+
+	* de.po: Fixed a typo ("StarDIS" -> "StarDOS").
+
+2008-07-18  pottendo  <pot...@ao...>
+
+	* de.po: Updated.
+
+2008-07-16  Spiro Trikaliotis  <spi...@gm...>
+
+	* de.po: Updated
+
+2008-07-16  Marco van den Heuvel  <bla...@ya...>
+
+	* de.po, fr.po, hu.po, it.po, pl.po, sv.po: Removed the '#~' items.
+
+	* nl.po: Updated.
+
 2008-07-08  Marco van den Heuvel  <bla...@ya...>
 
 	* de.po, fr.po, hu.po, it.po, nl.po, pl.po, sv.po: Removed the

Modified: branches/marco/ports/vice/po/de.po
===================================================================
--- branches/marco/ports/vice/po/de.po	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/po/de.po	2008-08-02 04:32:39 UTC (rev 19096)
@@ -6,9 +6,9 @@
 msgstr ""
 "Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
-"PO-Revision-Date: 2008-01-02 16:46+0100\n"
-"Last-Translator: Martin Pottendorfer (pot...@ut...)\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
+"PO-Revision-Date: 2008-07-18 16:38+0200\n"
+"Last-Translator: pottendo (pot...@gm...)\n"
 "Language-Team: de <de...@li...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -104,7 +104,7 @@
 #: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
 #: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
 #: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
 #: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
 #: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
 #: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -764,9 +764,8 @@
 msgstr "16KB Action Replay Image III (raw) einlegen"
 
 #: src/c64/cart/c64cart.c:261 src/translate.c.po.c:1502
-#, fuzzy
 msgid "Attach raw 32KB Action Replay IV cartridge image"
-msgstr "32K Action Replay Image einlegen"
+msgstr "32K Action Replay Image IV einlegen"
 
 #: src/c64/cart/c64cart.c:264 src/translate.c.po.c:1532
 msgid "Attach raw 64KB Retro Replay cartridge image"
@@ -805,9 +804,8 @@
 msgstr "Erweiterungsmodul Structured Basic (raw) Image einlegen"
 
 #: src/c64/cart/c64cart.c:291 src/translate.c.po.c:1492
-#, fuzzy
 msgid "Attach raw 16KB StarDOS cartridge image"
-msgstr "16KB Erweiterungsmodul (raw) Image einlegen"
+msgstr "16KB StarDOS Erweiterungsmodul Image einlegen"
 
 #: src/c64/cart/c64cart.c:294 src/translate.c.po.c:1612
 msgid "Enable expert cartridge"
@@ -999,23 +997,23 @@
 msgid "Size of the RAM expansion unit"
 msgstr "Gr\xF6\xDFe der RAM Speichererweiterung"
 
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
 msgid "Enable the TFE (\"The Final Ethernet\") unit"
 msgstr "TFE (\"the final ethernet\") Erweiterung aktivitieren"
 
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
 msgid "Disable the TFE (\"The Final Ethernet\") unit"
 msgstr "TFE (\"the final ethernet\") Erweiterung deaktivitieren"
 
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
 msgid "Set the system ethernet interface for TFE emulation"
 msgstr "Setze die System Ethernet Schnittstelle f\xFCr die TFE Emulation"
 
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
 msgid "Enable RRNet mode of TFE emulation"
 msgstr "RRNet Modus der TFE Emulation aktivieren"
 
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
 msgid "Disable RRNet mode of TFE emulation"
 msgstr "RRNet Modus der TFE Emulation deaktivieren"
 
@@ -1983,17 +1981,16 @@
 msgstr "Alte Helligkeitsemulation"
 
 #: src/vicii/vicii-cmdline-options.c:126 src/translate.c.po.c:2716
-#, fuzzy
 msgid "Set tint of internal calculated palette [1000]"
-msgstr "S\xE4ttigung f\xFCr intern berechneten Palette setzen [1000]"
+msgstr "Farbton f\xFCr intern berechneten Palette setzen [1000]"
 
 #: src/vicii/vicii-cmdline-options.c:128 src/translate.c.po.c:2726
 msgid "Set phase for color carrier in odd lines [1250]"
-msgstr ""
+msgstr "Phase f\xFCr Farbtr\xE4ger in ungeraden Zeilen setzen [1250]"
 
 #: src/vicii/vicii-cmdline-options.c:130 src/translate.c.po.c:2736
 msgid "Set phase offset for color carrier in odd lines [750]"
-msgstr ""
+msgstr "Phasenoffset f\xFCr Farbtr\xE4ger in ungeraden Zeilen setzen [750]"
 
 #: src/video/video-cmdline-options.c:60 src/translate.c.po.c:3748
 msgid "Enable double size"
@@ -3028,14 +3025,12 @@
 msgstr "Action Replay Image III einlegen..."
 
 #: src/arch/unix/gui/uic64cart.c:159
-#, fuzzy
 msgid "Attach Action Replay IV image..."
-msgstr "Action Replay Image III einlegen..."
+msgstr "Action Replay Image IV einlegen..."
 
 #: src/arch/unix/gui/uic64cart.c:162
-#, fuzzy
 msgid "Attach StarDOS image..."
-msgstr "Band Image einlegen..."
+msgstr "StarDOS Image einlegen..."
 
 #: src/arch/unix/gui/uic64cart.c:165
 msgid "Attach Atomic Power image..."
@@ -3315,7 +3310,7 @@
 msgstr "\xDCber VICE..."
 
 #: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
 #: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
 msgid "Reset"
 msgstr "Reset"
@@ -4127,34 +4122,31 @@
 msgid "Scanline Shade in percent"
 msgstr "Scanline Schatten in Prozent"
 
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
 msgid "New PAL Tint"
-msgstr ""
+msgstr "PAL Farbton"
 
 #: src/arch/unix/gui/uipalemu.c:88
-#, fuzzy
 msgid "Tint in percent"
-msgstr "Scanline Schatten in Prozent"
+msgstr "Farbton in Prozent"
 
 #: src/arch/unix/gui/uipalemu.c:95
 msgid "New PAL Odd Line Phase"
-msgstr ""
+msgstr "PAL ungerade Zeilenphase"
 
 #: src/arch/unix/gui/uipalemu.c:95
-#, fuzzy
 msgid "Phase in percent"
-msgstr "Passband Prozent"
+msgstr "Phase in Prozent"
 
 #: src/arch/unix/gui/uipalemu.c:102
 msgid "New PAL Odd Line Offset"
-msgstr ""
+msgstr "PAL ungerader Zeilenoffset"
 
 #: src/arch/unix/gui/uipalemu.c:102
-#, fuzzy
 msgid "Offset in percent"
-msgstr "Unsch\xE4rfe in Prozent"
+msgstr "Offset in Prozent"
 
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
 msgid "PAL Blurredness"
 msgstr "PAL Unsch\xE4rfe"
 
@@ -4170,27 +4162,25 @@
 msgid "*Fast PAL Emulation"
 msgstr "*Schnelle PAL Emulation"
 
-#: src/arch/unix/gui/uipalemu.c:138
-#, fuzzy
+#: src/arch/unix/gui/uipalemu.c:139
 msgid "*Old Exact PAL Emulation"
-msgstr "*Exakte PAL Emulation"
+msgstr "*Exakte PAL Emulation (erste Version)"
 
-#: src/arch/unix/gui/uipalemu.c:140
-#, fuzzy
+#: src/arch/unix/gui/uipalemu.c:142
 msgid "*New Exact PAL Emulation"
 msgstr "*Exakte PAL Emulation"
 
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
 msgid "PAL Scanline Shade"
 msgstr "PAL Scanline Schatten"
 
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
 msgid "New PAL Odd Lines Phase"
-msgstr ""
+msgstr "PAL ungerade Zeilenphase"
 
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
 msgid "New PAL Odd Lines Offset"
-msgstr ""
+msgstr "PAL ungerade Zeilenphase"
 
 #: src/arch/unix/gui/uipalette.c:47
 msgid "Load custom palette"
@@ -5424,59 +5414,58 @@
 msgid "Can't create image `%s'."
 msgstr "Kann Image `%s' nicht erzeugen."
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
 msgid "Blurredness"
 msgstr "Unsch\xE4rfe"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
 msgid "Scanline Shade"
 msgstr "Scanline Schatten"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
 msgid "Saturation"
 msgstr "S\xE4ttigung"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
 msgid "Brightness"
 msgstr "Helligkeit"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
-#, fuzzy
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
 msgid "Tint"
-msgstr "Client"
+msgstr "Farbton"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
 msgid "Odd Line Phase"
-msgstr ""
+msgstr "Ungerade Zeilenphase"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
 msgid "Odd Line Offset"
-msgstr ""
+msgstr "Ungerader Zeilenoffset"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
 msgid "PAL Settings"
 msgstr "PAL Einstellungen"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "Schnelle Emulation"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
+msgid "Fast"
+msgstr "Schnell"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "Exakte Emulation"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Exakt"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
-#, fuzzy
-msgid "New Exact Emulation"
-msgstr "Exakte Emulation"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
+msgid "New Exact"
+msgstr "Exakt"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4493
@@ -5763,9 +5752,8 @@
 msgstr "Monitor"
 
 #: src/arch/unix/x11/gnome/x11ui.c:1825
-#, fuzzy
 msgid "Continue"
-msgstr "Verzeichnis"
+msgstr "Fortsetzen"
 
 #: src/arch/unix/x11/gnome/x11ui.c:1871 src/arch/unix/x11/xaw/x11ui.c:1788
 msgid "Extend disk image"
@@ -6374,9 +6362,8 @@
 msgstr "Copyright (c) 2006-2008 Christian Vogelgsang"
 
 #: src/arch/win32/res.rc.po.c:568
-#, fuzzy
 msgid "Copyright (c) 2007-2008 Fabrizio Gennari"
-msgstr "Copyright (c) 2000-2004 Markus Brenner"
+msgstr "Copyright (c) 2007-2008 Fabrizio Gennari"
 
 #: src/arch/win32/res.rc.po.c:569
 msgid "Copyright (c) 1999-2007 Andreas Dehmel"
@@ -6682,11 +6669,11 @@
 
 #: src/arch/win32/res.rc.po.c:2958
 msgid "Odd lines phase"
-msgstr ""
+msgstr "Ungerade Zeilenphase"
 
 #: src/arch/win32/res.rc.po.c:2961
 msgid "Odd lines offset"
-msgstr ""
+msgstr "Ungerader Zeilenoffset"
 
 #: src/arch/win32/res.rc.po.c:3096
 msgid "Phase"
@@ -7207,9 +7194,8 @@
 msgstr "Farben"
 
 #: src/arch/win32/res.rc.po.c:5131
-#, fuzzy
 msgid "New PAL emulation"
-msgstr "*PAL Emulation"
+msgstr "PAL Emulation"
 
 #: src/arch/win32/res.rc.po.c:5132 src/arch/amigaos/intl.c.po.c:4367
 msgid "Video settings"
@@ -7245,14 +7231,12 @@
 msgstr "Action Replay III Erweiterungsmodul Image einlegen"
 
 #: src/arch/win32/res.rc.po.c:5143 src/arch/amigaos/intl.c.po.c:2432
-#, fuzzy
 msgid "Attach Action Replay 4 cartridge image"
-msgstr "Action Replay Erweiterungsmodul Image einlegen"
+msgstr "Action Replay 4 Erweiterungsmodul Image einlegen"
 
 #: src/arch/win32/res.rc.po.c:5144 src/arch/amigaos/intl.c.po.c:2441
-#, fuzzy
 msgid "Attach StarDOS cartridge image"
-msgstr "Erweiterungsmodul Image einlegen"
+msgstr "Erweiterungsmodul StarDOS Image einlegen"
 
 #: src/arch/win32/res.rc.po.c:5145 src/arch/amigaos/intl.c.po.c:2450
 msgid "Attach Atomic Power cartridge image"
@@ -7445,10 +7429,6 @@
 msgid "Adjusting"
 msgstr "Anpassend"
 
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Exakt"
-
 #: src/arch/win32/res.rc.po.c:5198
 msgid "Sound driver: DirectX"
 msgstr "Sound Treiber: DirectX"
@@ -7775,19 +7755,16 @@
 msgstr "&Action Replay Image..."
 
 #: src/arch/win32/resc128.rc.po.c:67
-#, fuzzy
 msgid "&Action Replay 3 image..."
-msgstr "&Action Replay Image..."
+msgstr "&Action Replay 3 Image..."
 
 #: src/arch/win32/resc128.rc.po.c:68
-#, fuzzy
 msgid "&Action Replay 4 image..."
-msgstr "&Action Replay Image..."
+msgstr "&Action Replay 4 Image..."
 
 #: src/arch/win32/resc128.rc.po.c:69
-#, fuzzy
 msgid "&StarDOS image..."
-msgstr "&CRT Image..."
+msgstr "&StarDOS Image..."
 
 #: src/arch/win32/resc128.rc.po.c:70 src/arch/win32/resc64.rc.po.c:70
 msgid "Atomic &Power image..."
@@ -7965,23 +7942,20 @@
 #: src/arch/win32/resc128.rc.po.c:123 src/arch/win32/resc64.rc.po.c:123
 #: src/arch/win32/rescbm2.rc.po.c:92 src/arch/win32/respet.rc.po.c:90
 #: src/arch/win32/resplus4.rc.po.c:102 src/arch/win32/resvic20.rc.po.c:100
-#, fuzzy
 msgid "&Edit"
-msgstr "Editor"
+msgstr "B&earbeiten"
 
 #: src/arch/win32/resc128.rc.po.c:125 src/arch/win32/resc64.rc.po.c:125
 #: src/arch/win32/rescbm2.rc.po.c:94 src/arch/win32/respet.rc.po.c:92
 #: src/arch/win32/resplus4.rc.po.c:104 src/arch/win32/resvic20.rc.po.c:102
-#, fuzzy
 msgid "&Copy"
-msgstr "S&top"
+msgstr "&Kopieren"
 
 #: src/arch/win32/resc128.rc.po.c:126 src/arch/win32/resc64.rc.po.c:126
 #: src/arch/win32/rescbm2.rc.po.c:95 src/arch/win32/respet.rc.po.c:93
 #: src/arch/win32/resplus4.rc.po.c:105 src/arch/win32/resvic20.rc.po.c:103
-#, fuzzy
 msgid "&Paste"
-msgstr "Pause"
+msgstr "&Einf\xFCgen"
 
 #: src/arch/win32/resc128.rc.po.c:128 src/arch/win32/resc64.rc.po.c:128
 #: src/arch/win32/rescbm2.rc.po.c:97 src/arch/win32/respet.rc.po.c:95
@@ -8830,14 +8804,12 @@
 msgstr "Action Replay &III Imagedatei..."
 
 #: src/arch/win32/resc64.rc.po.c:68
-#, fuzzy
 msgid "Action Replay &4 image..."
-msgstr "Action Replay Image..."
+msgstr "Action Replay &4 Image..."
 
 #: src/arch/win32/resc64.rc.po.c:69
-#, fuzzy
 msgid "Star&DOS image..."
-msgstr "&CRT Image..."
+msgstr "Star&DOS Image..."
 
 #: src/arch/win32/resc64.rc.po.c:153 src/arch/amigaos/intl.c.po.c:870
 msgid "Netplay (experimental)..."
@@ -10151,19 +10123,16 @@
 msgstr "Action Replay Image..."
 
 #: src/arch/amigaos/intl.c.po.c:483
-#, fuzzy
 msgid "Action Replay 3 image..."
-msgstr "Action Replay Image..."
+msgstr "Action Replay 3 Image..."
 
 #: src/arch/amigaos/intl.c.po.c:492
-#, fuzzy
 msgid "Action Replay 4 image..."
-msgstr "Action Replay Image..."
+msgstr "Action Replay 4 Image..."
 
 #: src/arch/amigaos/intl.c.po.c:501
-#, fuzzy
 msgid "StarDOS image..."
-msgstr "CRT Image..."
+msgstr "StarDOS Image..."
 
 #: src/arch/amigaos/intl.c.po.c:510
 msgid "Atomic Power image..."
@@ -10210,18 +10179,16 @@
 msgstr "Exit"
 
 #: src/arch/amigaos/intl.c.po.c:699
-#, fuzzy
 msgid "Edit"
-msgstr "Editor"
+msgstr "Bearbeiten"
 
 #: src/arch/amigaos/intl.c.po.c:708
 msgid "Copy"
-msgstr ""
+msgstr "Kopie"
 
 #: src/arch/amigaos/intl.c.po.c:717
-#, fuzzy
 msgid "Paste"
-msgstr "Phase"
+msgstr "Einf\xFCgen"
 
 #: src/arch/amigaos/intl.c.po.c:735
 msgid "Load snapshot image..."
@@ -10726,9 +10693,8 @@
 msgstr "Ja|Nein"
 
 #: src/arch/amigaos/intl.c.po.c:2423
-#, fuzzy
 msgid "Attach Action Replay 3 cartridge image"
-msgstr "Action Replay Erweiterungsmodul Image einlegen"
+msgstr "Action Replay 3 Erweiterungsmodul Image einlegen"
 
 #: src/arch/amigaos/intl.c.po.c:2585
 msgid "Attach"
@@ -11120,7 +11086,6 @@
 msgstr "Schnelle PAL"
 
 #: src/arch/amigaos/intl.c.po.c:4241
-#, fuzzy
 msgid "New PAL Emulation"
 msgstr "PAL Emulation"
 
@@ -11141,19 +11106,16 @@
 msgstr "PAL Unsch\xE4rfe (0..1)"
 
 #: src/arch/amigaos/intl.c.po.c:4286
-#, fuzzy
 msgid "Tint (0..2)"
-msgstr "(0..2)"
+msgstr "Farbton (0..2)"
 
 #: src/arch/amigaos/intl.c.po.c:4295
-#, fuzzy
 msgid "Odd Lines Phase (0..2)"
-msgstr "Helligkeit (0..2)"
+msgstr "Ungerade Zeilenphase (0..2)"
 
 #: src/arch/amigaos/intl.c.po.c:4304
-#, fuzzy
 msgid "Odd Lines Offset (0..2)"
-msgstr "Helligkeit (0..2)"
+msgstr "Ungerader Zeilenoffset (0..2)"
 
 #: src/arch/amigaos/intl.c.po.c:4322
 msgid "External Palette"

Modified: branches/marco/ports/vice/po/fr.po
===================================================================
--- branches/marco/ports/vice/po/fr.po	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/po/fr.po	2008-08-02 04:32:39 UTC (rev 19096)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
 "PO-Revision-Date: 2007-07-26 11:57+0200\n"
 "Last-Translator: Paul Dub\xE9 <dub...@gm...>\n"
 "Language-Team: fr <fr...@li...>\n"
@@ -108,7 +108,7 @@
 #: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
 #: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
 #: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
 #: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
 #: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
 #: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -1043,26 +1043,26 @@
 msgid "Size of the RAM expansion unit"
 msgstr "Taille de l'unit\xE9 d'expansion RAM"
 
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
 #, fuzzy
 msgid "Enable the TFE (\"The Final Ethernet\") unit"
 msgstr "Activer l'unit\xE9 TFE (\"The Final Ethernet\")"
 
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
 #, fuzzy
 msgid "Disable the TFE (\"The Final Ethernet\") unit"
 msgstr "D\xE9sactiver l'unit\xE9 TFE"
 
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
 msgid "Set the system ethernet interface for TFE emulation"
 msgstr ""
 
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
 #, fuzzy
 msgid "Enable RRNet mode of TFE emulation"
 msgstr "*Activer l'\xE9mulation r\xE9elle de lecteur"
 
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
 #, fuzzy
 msgid "Disable RRNet mode of TFE emulation"
 msgstr "D\xE9sactiver l'\xE9mulation de p\xE9riph\xE9rique RS232 userport"
@@ -3416,7 +3416,7 @@
 msgstr "\xC0 propos de VICE..."
 
 #: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
 #: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
 msgid "Reset"
 msgstr "R\xE9initialiser"
@@ -4267,7 +4267,7 @@
 msgid "Scanline Shade in percent"
 msgstr "Opacit\xE9 de l'ombrage (%)"
 
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
 msgid "New PAL Tint"
 msgstr ""
 
@@ -4294,7 +4294,7 @@
 msgid "Offset in percent"
 msgstr "Quantit\xE9 de flou (%)"
 
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
 msgid "PAL Blurredness"
 msgstr "Flou PAL"
 
@@ -4310,25 +4310,25 @@
 msgid "*Fast PAL Emulation"
 msgstr "*\xC9mulation PAL rapide"
 
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
 #, fuzzy
 msgid "*Old Exact PAL Emulation"
 msgstr "*\xC9mulation exacte PAL"
 
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
 #, fuzzy
 msgid "*New Exact PAL Emulation"
 msgstr "*\xC9mulation exacte PAL"
 
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
 msgid "PAL Scanline Shade"
 msgstr "Ombrage des scanlines PAL"
 
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
 msgid "New PAL Odd Lines Phase"
 msgstr ""
 
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
 msgid "New PAL Odd Lines Offset"
 msgstr ""
 
@@ -5595,59 +5595,61 @@
 msgid "Can't create image `%s'."
 msgstr "Impossible de cr\xE9er l'image `%s'."
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
 msgid "Blurredness"
 msgstr "Quantit\xE9 de flou"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
 msgid "Scanline Shade"
 msgstr "Ombrage des scanlines"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
 msgid "Saturation"
 msgstr "Saturation"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
 msgid "Contrast"
 msgstr "Contraste"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
 msgid "Brightness"
 msgstr "Luminosit\xE9"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
 msgid "Gamma"
 msgstr "Intensit\xE9"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
 #, fuzzy
 msgid "Tint"
 msgstr "&Imprimer"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
 msgid "Odd Line Phase"
 msgstr ""
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
 msgid "Odd Line Offset"
 msgstr ""
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
 msgid "PAL Settings"
 msgstr "Param\xE8tres PAL"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "\xC9mulation rapide"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
+#, fuzzy
+msgid "Fast"
+msgstr "*Rapide"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "\xC9mulation exacte"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Exact"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
 #, fuzzy
-msgid "New Exact Emulation"
-msgstr "\xC9mulation exacte"
+msgid "New Exact"
+msgstr "Exact"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4493
@@ -7660,10 +7662,6 @@
 msgid "Adjusting"
 msgstr "Ajust\xE9"
 
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Exact"
-
 #: src/arch/win32/res.rc.po.c:5198
 #, fuzzy
 msgid "Sound driver: DirectX"

Modified: branches/marco/ports/vice/po/hu.po
===================================================================
--- branches/marco/ports/vice/po/hu.po	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/po/hu.po	2008-08-02 04:32:39 UTC (rev 19096)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: VICE 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
 "PO-Revision-Date: 2007-07-27 15:58+0200\n"
 "Last-Translator: Karai Csaba <cs...@fr...>\n"
 "Language-Team: Hungarian <hu...@li...>\n"
@@ -105,7 +105,7 @@
 #: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
 #: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
 #: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
 #: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
 #: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
 #: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -1005,23 +1005,23 @@
 msgid "Size of the RAM expansion unit"
 msgstr "RAM Expansion Unit m\xE9rete"
 
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
 msgid "Enable the TFE (\"The Final Ethernet\") unit"
 msgstr "TFE (\"the final ethernet\") egys\xE9g enged\xE9lyez\xE9se"
 
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
 msgid "Disable the TFE (\"The Final Ethernet\") unit"
 msgstr "TFE (\"the final ethernet\") egys\xE9g tilt\xE1sa"
 
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
 msgid "Set the system ethernet interface for TFE emulation"
 msgstr "Rendszer ethernet eszk\xF6z be\xE1ll\xEDt\xE1sa TFE emul\xE1ci\xF3hoz"
 
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
 msgid "Enable RRNet mode of TFE emulation"
 msgstr "RRNet m\xF3d enged\xE9lyez\xE9se TFE emul\xE1ci\xF3hoz"
 
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
 msgid "Disable RRNet mode of TFE emulation"
 msgstr "RRNet m\xF3d tilt\xE1sa TFE emul\xE1ci\xF3hoz"
 
@@ -3342,7 +3342,7 @@
 msgstr "A VICE-r\xF3l..."
 
 #: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
 #: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
 msgid "Reset"
 msgstr "Reset"
@@ -4154,7 +4154,7 @@
 msgid "Scanline Shade in percent"
 msgstr "P\xE1szta \xE1rnyal\xE1s sz\xE1zal\xE9kban"
 
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
 msgid "New PAL Tint"
 msgstr ""
 
@@ -4181,7 +4181,7 @@
 msgid "Offset in percent"
 msgstr "Elmos\xE1s sz\xE1zal\xE9kban"
 
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
 msgid "PAL Blurredness"
 msgstr "PAL elmos\xE1s"
 
@@ -4197,25 +4197,25 @@
 msgid "*Fast PAL Emulation"
 msgstr "*Gyors PAL emul\xE1ci\xF3"
 
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
 #, fuzzy
 msgid "*Old Exact PAL Emulation"
 msgstr "*Pontos PAL emul\xE1ci\xF3"
 
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
 #, fuzzy
 msgid "*New Exact PAL Emulation"
 msgstr "*Pontos PAL emul\xE1ci\xF3"
 
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
 msgid "PAL Scanline Shade"
 msgstr "PAL p\xE1szta \xE1rnyal\xE1s"
 
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
 msgid "New PAL Odd Lines Phase"
 msgstr ""
 
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
 msgid "New PAL Odd Lines Offset"
 msgstr ""
 
@@ -5462,59 +5462,61 @@
 msgid "Can't create image `%s'."
 msgstr "Nem siker\xFClt `%s' k\xE9pm\xE1st l\xE9trehozni."
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
 msgid "Blurredness"
 msgstr "Elmos\xE1s"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
 msgid "Scanline Shade"
 msgstr "P\xE1szta \xE1rnyal\xE1s"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
 msgid "Saturation"
 msgstr "Tel\xEDtetts\xE9g"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
 msgid "Contrast"
 msgstr "Kontraszt"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
 msgid "Brightness"
 msgstr "F\xE9nyess\xE9g"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
 #, fuzzy
 msgid "Tint"
 msgstr "Kliens"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
 msgid "Odd Line Phase"
 msgstr ""
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
 msgid "Odd Line Offset"
 msgstr ""
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
 msgid "PAL Settings"
 msgstr "PAL Be\xE1ll\xEDt\xE1sai"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "Gyors emul\xE1ci\xF3"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:199
+#, fuzzy
+msgid "Fast"
+msgstr "*Gyors"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:205
-msgid "Exact Emulation"
-msgstr "Pontos emul\xE1ci\xF3"
+#: src/arch/unix/x11/gnome/uipalcontrol.c:207 src/arch/win32/res.rc.po.c:5197
+#: src/arch/amigaos/intl.c.po.c:3755
+msgid "Exact"
+msgstr "Pontos"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:211
+#: src/arch/unix/x11/gnome/uipalcontrol.c:214
 #, fuzzy
-msgid "New Exact Emulation"
-msgstr "Pontos emul\xE1ci\xF3"
+msgid "New Exact"
+msgstr "Pontos"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4493
@@ -7483,10 +7485,6 @@
 msgid "Adjusting"
 msgstr "Igazod\xF3"
 
-#: src/arch/win32/res.rc.po.c:5197 src/arch/amigaos/intl.c.po.c:3755
-msgid "Exact"
-msgstr "Pontos"
-
 #: src/arch/win32/res.rc.po.c:5198
 msgid "Sound driver: DirectX"
 msgstr "Hang meghajt\xF3: DirectX"

Modified: branches/marco/ports/vice/po/it.po
===================================================================
--- branches/marco/ports/vice/po/it.po	2008-08-01 21:32:15 UTC (rev 19095)
+++ branches/marco/ports/vice/po/it.po	2008-08-02 04:32:39 UTC (rev 19096)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: VICE 1.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-13 20:27+0200\n"
+"POT-Creation-Date: 2008-07-18 22:21+0200\n"
 "PO-Revision-Date: 2007-07-28 14:26+0100\n"
 "Last-Translator: Andrea Musuruane <mus...@gm...>\n"
 "Language-Team: it <it...@li...>\n"
@@ -104,7 +104,7 @@
 #: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:260
 #: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
 #: src/c64/plus60k.c:249 src/c64/ramcart.c:284 src/c64/reu.c:478
-#: src/c64/tfe.c:1940 src/cbm2/cbm2-cmdline-options.c:132
+#: src/c64/tfe.c:1942 src/cbm2/cbm2-cmdline-options.c:132
 #: src/cbm2/cbm2-cmdline-options.c:134 src/cbm2/cbm2-cmdline-options.c:136
 #: src/cbm2/cbm2-cmdline-options.c:139 src/cbm2/cbm2-cmdline-options.c:141
 #: src/cbm2/cbm2-cmdline-options.c:143 src/cbm2/cbm2-cmdline-options.c:145
@@ -1028,23 +1028,23 @@
 msgid "Size of the RAM expansion unit"
 msgstr "Dimensione dell'espansione di RAM"
 
-#: src/c64/tfe.c:1936 src/translate.c.po.c:1391
+#: src/c64/tfe.c:1938 src/translate.c.po.c:1391
 msgid "Enable the TFE (\"The Final Ethernet\") unit"
 msgstr "Attiva l'unit\xE0 TFE (\"The Final Ethernet\")"
 
-#: src/c64/tfe.c:1938 src/translate.c.po.c:1401
+#: src/c64/tfe.c:1940 src/translate.c.po.c:1401
 msgid "Disable the TFE (\"The Final Ethernet\") unit"
 msgstr "Disattiva l'unit\xE0 TFE (\"The Final Ethernet\")"
 
-#: src/c64/tfe.c:1940 src/translate.c.po.c:1411
+#: src/c64/tfe.c:1942 src/translate.c.po.c:1411
 msgid "Set the system ethernet interface for TFE emulation"
 msgstr "Imposta l'interfaccia ethernet per l'emulazione TFE"
 
-#: src/c64/tfe.c:1942 src/translate.c.po.c:1421
+#: src/c64/tfe.c:1944 src/translate.c.po.c:1421
 msgid "Enable RRNet mode of TFE emulation"
 msgstr "Attiva la modalit\xE0 RRNet dell'emulazione TFE"
 
-#: src/c64/tfe.c:1944 src/translate.c.po.c:1431
+#: src/c64/tfe.c:1946 src/translate.c.po.c:1431
 msgid "Disable RRNet mode of TFE emulation"
 msgstr "Disattiva la modalit\xE0 RRNet dell'emulazione TFE"
 
@@ -3382,7 +3382,7 @@
 msgstr "Informazioni su VICE..."
 
 #: src/arch/unix/gui/uicommands.c:569 src/arch/unix/gui/uidatasette.c:98
-#: src/arch/unix/x11/gnome/uipalcontrol.c:189
+#: src/arch/unix/x11/gnome/uipalcontrol.c:190
 #: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
 msgid "Reset"
 msgstr "Reset"
@@ -4196,7 +4196,7 @@
 msgid "Scanline Shade in percent"
 msgstr "Ombra della scanline in percentuale"
 
-#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
+#: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:150
 msgid "New PAL Tint"
 msgstr ""
 
@@ -4223,7 +4223,7 @@
 msgid "Offset in percent"
 msgstr "Sfuocatura in percentuale"
 
-#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
+#: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:148
 msgid "PAL Blurredness"
 msgstr "Sfuocatura PAL"
 
@@ -4239,25 +4239,25 @@
 msgid "*Fast PAL Emulation"
 msgstr "*Emulazione PAL veloce"
 
-#: src/arch/unix/gui/uipalemu.c:138
+#: src/arch/unix/gui/uipalemu.c:139
 #, fuzzy
 msgid "*Old Exact PAL Emulation"
 msgstr "*Emulazione PAL esatta"
 
-#: src/arch/unix/gui/uipalemu.c:140
+#: src/arch/unix/gui/uipalemu.c:142
 #, fuzzy
 msgid "*New Exact PAL Emulation"
 msgstr "*Emulazione PAL esatta"
 
-#: src/arch/unix/gui/uipalemu.c:144
+#: src/arch/unix/gui/uipalemu.c:146
 msgid "PAL Scanline Shade"
 msgstr "Ombra della scanline PAL"
 
-#: src/arch/unix/gui/uipalemu.c:150
+#: src/arch/unix/gui/uipalemu.c:152
 msgid "New PAL Odd Lines Phase"
 msgstr ""
 
-#: src/arch/unix/gui/uipalemu.c:152
+#: src/arch/unix/gui/uipalemu.c:154
 msgid "New PAL Odd Lines Offset"
 msgstr ""
 
@@ -5505,59 +5505,61 @@
 msgid "Can't create image `%s'."
 msgstr "Non \xE8 possibile creare l'immagine `%s'."
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:49
+#: src/arch/unix/x11/gnome/uipalcontrol.c:52
 msgid "Blurredness"
 msgstr "Sfuocatura"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:50
+#: src/arch/unix/x11/gnome/uipalcontrol.c:53
 msgid "Scanline Shade"
 msgstr "Ombra scanline"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:51 src/arch/win32/res.rc.po.c:2817
+#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:2817
 msgid "Saturation"
 msgstr "Saturazione"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:52 src/arch/win32/res.rc.po.c:2820
+#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2820
 msgid "Contrast"
 msgstr "Contrasto"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:53 src/arch/win32/res.rc.po.c:2823
+#: src/arch/unix/x11/gnome/uipalcontrol.c:56 src/arch/win32/res.rc.po.c:2823
 msgid "Brightness"
 msgstr "Luminosit\xE0"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:54 src/arch/win32/res.rc.po.c:3093
+#: src/arch/unix/x11/gnome/uipalcontrol.c:57 src/arch/win32/res.rc.po.c:3093
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
+#: src/arch/unix/x11/gnome/uipalcontrol.c:58 src/arch/win32/res.rc.po.c:2955
 #, fuzzy
 msgid "Tint"
 msgstr "Client"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:56
+#: src/arch/unix/x11/gnome/uipalcontrol.c:59
 msgid "Odd Line Phase"
 msgstr ""
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:57
+#: src/arch/unix/x11/gnome/uipalcontrol.c:60
 msgid "Odd Line Offset"
 msgstr ""
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:145
+#: src/arch/unix/x11/gnome/uipalcontrol.c:146
 msgid "PAL Settings"
 msgstr "Impostazioni PAL"
 
-#: src/arch/unix/x11/gnome/uipalcontrol.c:198
-msgid "Fast Emulation"
-msgstr "Emulazione veloce"
+#: src/a...
 
[truncated message content]

19 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 1054 1055 1056 1057 1058 .. 1071 > >> (Page 1056 of 1071)