Revision: 18990
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18990&view=rev
Author: nojoopa
Date: 2008-07-10 01:46:59 -0700 (Thu, 10 Jul 2008)
Log Message:
-----------
x64dtv merging part 2
Modified Paths:
--------------
branches/viceplus/v1.22.24-x64dtv/vice/Makefile.am
branches/viceplus/v1.22.24-x64dtv/vice/po/POTFILES.in
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/Makefile.am
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/Makefile.am
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.c
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.h
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uisid.c
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/icon.h
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/Makefile.am
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/xaw/Makefile.am
branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/Makefile.am
branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/mon_lex.c
branches/viceplus/v1.22.24-x64dtv/vice/src/monitor/mon_parse.c
Added Paths:
-----------
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64dtvui.c
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.c
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.h
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.c
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.h
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.c
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.h
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/skyos/icons/x64dtv.ico
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/c64dtvicon.c
branches/viceplus/v1.22.24-x64dtv/vice/src/arch/win32/resc64dtv.rc
Modified: branches/viceplus/v1.22.24-x64dtv/vice/Makefile.am
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/Makefile.am 2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/Makefile.am 2008-07-10 08:46:59 UTC (rev 18990)
@@ -11,13 +11,16 @@
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)
+x64dtv:
+ (cd src; $(MAKE) x64dtv-all)
+
xvic:
(cd src; $(MAKE) xvic-all)
Modified: branches/viceplus/v1.22.24-x64dtv/vice/po/POTFILES.in
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/po/POTFILES.in 2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/po/POTFILES.in 2008-07-10 08:46:59 UTC (rev 18990)
@@ -18,11 +18,16 @@
src/c128/c128mmu.c
src/c128/functionrom.c
src/c64/c64-cmdline-options.c
+src/c64dtv/c64dtv-cmdline-options.c
src/c64/cart/c64cart.c
src/c64/cart/ide64.c
src/c64/c64_256k.c
+src/c64dtv/c64dtvblitter.c
+src/c64dtv/c64dtvdma.c
+src/c64dtv/c64dtvflash.c
src/c64/digimax.c
src/c64/georam.c
+src/c64dtv/hummeradc.c
src/c64/mmc64.c
src/c64/plus256k.c
src/c64/plus60k.c
@@ -60,6 +65,7 @@
src/printerdrv/interface-userport.c
src/printerdrv/output-select.c
src/printerdrv/output-text.c
+src/ps2mouse.c
src/ram.c
src/raster/raster-cmdline-options.c
src/rs232drv/rs232drv.c
@@ -201,6 +207,7 @@
src/arch/win32/resc128.rc.po.c
src/arch/win32/resc64.rc.po.c
src/arch/win32/resc64_256k.rc.po.c
+src/arch/win32/resc64dtv.rc.po.c
src/arch/win32/rescbm2.rc.po.c
src/arch/win32/resdigimax.rc.po.c
src/arch/win32/resdrivec128.rc.po.c
Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/Makefile.am
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/Makefile.am 2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/Makefile.am 2008-07-10 08:46:59 UTC (rev 18990)
@@ -28,6 +28,7 @@
-I$(top_builddir)/src \
-I$(top_srcdir)/src/drive \
-I$(top_srcdir)/src/c64 \
+ -I$(top_srcdir)/src/c64dtv \
-I$(top_srcdir)/src/c128 \
-I$(top_srcdir)/src/vic20 \
-I$(top_srcdir)/src/pet \
@@ -86,6 +87,7 @@
sco_sol/convertprototype.c \
sco_sol/make-bindist.sh \
skyos/icons/x64.ico \
+ skyos/icons/x64dtv.ico \
skyos/icons/x128.ico \
skyos/icons/xcbm2.ico \
skyos/icons/xpet.ico \
@@ -110,3 +112,4 @@
.PHONY: macosx
macosx:
(cd macosx; $(MAKE))
+
Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/Makefile.am
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/Makefile.am 2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/Makefile.am 2008-07-10 08:46:59 UTC (rev 18990)
@@ -6,6 +6,7 @@
-I$(top_builddir)/src \
-I$(top_srcdir)/src/drive \
-I$(top_srcdir)/src/c64 \
+ -I$(top_srcdir)/src/c64dtv \
-I$(top_srcdir)/src/c128 \
-I$(top_srcdir)/src/vic20 \
-I$(top_srcdir)/src/pet \
@@ -18,6 +19,7 @@
libarchgui_a_SOURCES = \
c128ui.c \
c64ui.c \
+ c64dtvui.c \
cbm2ui.c \
petui.c \
plus4ui.c \
@@ -30,6 +32,8 @@
uic64_256k.h \
uic64cart.c \
uic64cart.h \
+ uic64dtv.c \
+ uic64dtv.h \
uicartridge.h \
uicmdline.c \
uicommands.c \
@@ -46,6 +50,8 @@
uidrivec128.h \
uidrivec64.c \
uidrivec64.h \
+ uidrivec64dtv.c \
+ uidrivec64dtv.h \
uidrivec64c128.c \
uidrivec64c128.h \
uidrivec64vic20.c \
@@ -105,6 +111,8 @@
uiprinteriecplus4.h \
uiprinterieee.c \
uiprinterieee.h \
+ uips2mouse.c \
+ uips2mouse.h \
uiramcart.c \
uiramcart.h \
uireu.c \
Copied: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64dtvui.c (from rev 18985, branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64ui.c)
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64dtvui.c (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/c64dtvui.c 2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,354 @@
+/*
+ * c64dtvui.c - Implementation of the C64DTV-specific part of the UI.
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "debug.h"
+#include "icon.h"
+#include "machine.h"
+#include "machine-video.h"
+#include "resources.h"
+#include "uiattach.h"
+#include "uic64dtv.h"
+#include "uicommands.h"
+#include "uidrive.h"
+#include "uidrivec64dtv.h"
+#include "uidrivec64vic20.h"
+#include "uijoystick2.h"
+#include "uikeyboard.h"
+#include "uimenu.h"
+#include "uiperipheraliec.h"
+#include "uips2mouse.h"
+#include "uiromset.h"
+#include "uiscreenshot.h"
+#include "uisettings.h"
+#include "uisid.h"
+#include "uisound.h"
+#include "uitfe.h"
+#include "uivicii.h"
+#include "vsync.h"
+
+
+UI_MENU_DEFINE_RADIO(MachineVideoStandard)
+
+ui_menu_entry_t set_video_standard_submenu[] = {
+ { N_("*PAL-G"), (ui_callback_t)radio_MachineVideoStandard,
+ (ui_callback_data_t)MACHINE_SYNC_PAL, NULL },
+ { N_("*NTSC-M"), (ui_callback_t)radio_MachineVideoStandard,
+ (ui_callback_data_t)MACHINE_SYNC_NTSC, NULL },
+ { NULL }
+};
+
+/* ------------------------------------------------------------------------- */
+
+UI_MENU_DEFINE_TOGGLE(SidFilters)
+
+ui_menu_entry_t sid_submenu[] = {
+ { N_("SID engine"),
+ NULL, NULL, sid_engine_submenu },
+ { "--" },
+ { N_("*Emulate filters"),
+ (ui_callback_t)toggle_SidFilters, NULL, NULL },
+ { N_("Chip model"),
+ NULL, NULL, sid_model_submenu },
+#ifdef HAVE_RESID
+ { "--" },
+ { N_("reSID sampling method"),
+ NULL, NULL, sid_resid_sampling_submenu },
+ { N_("reSID resampling passband..."),
+ (ui_callback_t)set_sid_resid_passband, NULL, NULL },
+#endif
+ { NULL },
+};
+
+UI_MENU_DEFINE_TOGGLE(Sound)
+
+static ui_menu_entry_t sid_options_submenu[] = {
+ { N_("SID engine"),
+ NULL, NULL, sid_engine_submenu },
+ { N_("*Enable sound playback"),
+ (ui_callback_t)toggle_Sound, NULL, NULL },
+ { N_("*Emulate filters"),
+ (ui_callback_t)toggle_SidFilters, NULL, NULL },
+ { N_("Chip model"),
+ NULL, NULL, sid_model_submenu },
+ { NULL }
+};
+
+/* ------------------------------------------------------------------------- */
+
+UI_MENU_DEFINE_TOGGLE(EmuID)
+
+static ui_menu_entry_t io_extensions_submenu[] = {
+ { N_("*Emulator identification"),
+ (ui_callback_t)toggle_EmuID, NULL, NULL },
+#ifdef HAVE_MOUSE
+ { N_("*PS/2 Mouse Emulation"),
+ NULL, NULL, ps2_mouse_submenu },
+#endif
+ { NULL }
+};
+
+/* ------------------------------------------------------------------------- */
+
+static ui_menu_entry_t c64ui_main_romset_submenu[] = {
+ { N_("Load new kernal ROM"),
+ (ui_callback_t)ui_load_rom_file,
+ (ui_callback_data_t)"KernalName", NULL },
+ { N_("Load new BASIC ROM"),
+ (ui_callback_t)ui_load_rom_file,
+ (ui_callback_data_t)"BasicName", NULL },
+ { N_("Load new character ROM"),
+ (ui_callback_t)ui_load_rom_file,
+ (ui_callback_data_t)"ChargenName", NULL },
+ { NULL }
+};
+
+static ui_menu_entry_t c64_romset_submenu[] = {
+ { N_("Load default ROMs"),
+ (ui_callback_t)ui_set_romset,
+ (ui_callback_data_t)"default.vrs", NULL },
+ { "--" },
+ { N_("Load new computer ROM"),
+ NULL, NULL, c64ui_main_romset_submenu },
+ { N_("Load new drive ROM"),
+ NULL, NULL, ui_drivec64vic20_romset_submenu },
+ { "--" },
+ { N_("ROM set type"),
+ NULL, NULL, uiromset_type_submenu },
+ { "--" },
+ { N_("ROM set archive"),
+ NULL, NULL, uiromset_archive_submenu },
+ { N_("ROM set file"),
+ NULL, NULL, uiromset_file_submenu },
+ { NULL }
+};
+
+/* ------------------------------------------------------------------------- */
+
+static UI_CALLBACK(save_screenshot)
+{
+ /* Where does the 1024 come from? */
+ char filename[1024];
+ unsigned int wid = (unsigned int)UI_MENU_CB_PARAM;
+
+ vsync_suspend_speed_eval();
+
+ /* The following code depends on a zeroed filename. */
+ memset(filename, 0, 1024);
+
+ if (ui_screenshot_dialog(filename, machine_video_canvas_get(wid)) < 0)
+ return;
+}
+
+static ui_menu_entry_t ui_screenshot_commands_menu[] = {
+ { N_("Save media file"),
+ (ui_callback_t)save_screenshot, (ui_callback_data_t)0, NULL },
+ { NULL }
+};
+
+/* ------------------------------------------------------------------------- */
+
+static ui_menu_entry_t c64_menu[] = {
+ { N_("ROM settings"),
+ NULL, NULL, c64_romset_submenu },
+ { N_("VIC-II settings"),
+ NULL, NULL, vicii_submenu },
+ { N_("SID settings"),
+ NULL, NULL, sid_submenu },
+ { N_("C64DTV settings"),
+ NULL, NULL, c64dtv_submenu },
+ { NULL }
+};
+
+static ui_menu_entry_t x64_left_menu[] = {
+ { "",
+ NULL, NULL, uiattach_disk_menu },
+ { "--",
+ NULL, NULL, uiattach_smart_attach_menu },
+ { "",
+ NULL, NULL, ui_directory_commands_menu },
+ { "--",
+ NULL, NULL, ui_snapshot_commands_menu },
+ { "",
+ NULL, NULL, ui_screenshot_commands_menu },
+ { "",
+ NULL, NULL, ui_sound_record_commands_menu },
+ { "--",
+ NULL, NULL, ui_tool_commands_menu },
+ { "--",
+ NULL, NULL, ui_help_commands_menu },
+ { "--",
+ NULL, NULL, ui_run_commands_menu },
+ { "--",
+ NULL, NULL, ui_exit_commands_menu },
+ { NULL }
+};
+
+static ui_menu_entry_t x64_right_menu[] = {
+ { "",
+ NULL, NULL, ui_performance_settings_menu },
+ { "--",
+ NULL, NULL, uikeyboard_settings_menu },
+ { "",
+ NULL, NULL, ui_sound_settings_menu },
+ { "",
+ NULL, NULL, ui_drivec64dtv_settings_menu },
+ { "",
+ NULL, NULL, ui_peripheraliec_settings_menu },
+ { "",
+ NULL, NULL, joystick_settings_menu },
+ { "--",
+ NULL, NULL, c64_menu },
+ { "--",
+ NULL, NULL, ui_settings_settings_menu },
+#ifdef DEBUG
+ { "--",
+ NULL, NULL, ui_debug_settings_menu },
+#endif
+ { NULL }
+};
+
+static ui_menu_entry_t x64_file_submenu[] = {
+ { "",
+ NULL, NULL, uiattach_smart_attach_menu },
+ { "--",
+ NULL, NULL, uiattach_disk_menu },
+ { "--",
+ NULL, NULL, ui_directory_commands_menu },
+ { "--",
+ NULL, NULL, ui_tool_commands_menu },
+ { "--",
+ NULL, NULL, ui_run_commands_menu },
+ { "--",
+ NULL, NULL, ui_exit_commands_menu },
+ { NULL }
+};
+
+static ui_menu_entry_t x64_snapshot_submenu[] = {
+ { "",
+ NULL, NULL, ui_snapshot_commands_submenu },
+ { "--",
+ NULL, NULL, ui_screenshot_commands_menu },
+ { "",
+ NULL, NULL, ui_sound_record_commands_menu },
+ { NULL }
+};
+
+static ui_menu_entry_t x64_options_submenu[] = {
+ { "",
+ NULL, NULL, ui_performance_settings_menu },
+ { "--",
+ NULL, NULL, joystick_options_submenu },
+ { "--",
+ NULL, NULL, sid_options_submenu },
+ { "--",
+ NULL, NULL, c64dtv_submenu },
+ { "--",
+ NULL, NULL, ui_drive_options_submenu },
+ { "--",
+ NULL, NULL, ui_flash_options_submenu },
+ { "--",
+ NULL, NULL, io_extensions_submenu },
+ { NULL }
+};
+
+static ui_menu_entry_t x64_settings_submenu[] = {
+ { "",
+ NULL, NULL, uikeyboard_settings_menu },
+ { "",
+ NULL, NULL, ui_sound_settings_menu },
+ { "",
+ NULL, NULL, ui_drivec64dtv_settings_menu },
+ { "",
+ NULL, NULL, ui_peripheraliec_settings_menu },
+ { "",
+ NULL, NULL, joystick_settings_menu },
+ { "--",
+ NULL, NULL, c64_menu },
+ { "--",
+ NULL, NULL, ui_settings_settings_menu },
+ { NULL }
+};
+
+static ui_menu_entry_t x64_main_menu[] = {
+ { N_("File"),
+ NULL, NULL, x64_file_submenu },
+ { N_("Snapshot"),
+ NULL, NULL, x64_snapshot_submenu },
+ { N_("Options"),
+ NULL, NULL, x64_options_submenu },
+ { N_("Settings"),
+ NULL, NULL, x64_settings_submenu },
+ /* Translators: RJ means right justify and should be
+ saved in your tranlation! e.g. german "RJHilfe" */
+ { N_("RJHelp"),
+ NULL, NULL, ui_help_commands_menu },
+ { NULL }
+};
+
+static ui_menu_entry_t x64_speed_menu[] = {
+ { "",
+ NULL, NULL, ui_performance_settings_menu },
+ { "--" },
+ { "--" },
+ { NULL }
+};
+
+static void c64ui_dynamic_menu_create(void)
+{
+ uisound_menu_create();
+ uivicii_menu_create();
+}
+
+static void c64ui_dynamic_menu_shutdown(void)
+{
+ uivicii_menu_shutdown();
+ uisound_menu_shutdown();
+}
+
+int c64dtvui_init(void)
+{
+ ui_set_application_icon(c64dtv_icon_data);
+ c64ui_dynamic_menu_create();
+
+ ui_set_left_menu(x64_left_menu);
+ ui_set_right_menu(x64_right_menu);
+ ui_set_topmenu(x64_main_menu);
+ ui_set_speedmenu(x64_speed_menu);
+
+ ui_update_menus();
+
+ return 0;
+}
+
+void c64dtvui_shutdown(void)
+{
+ c64ui_dynamic_menu_shutdown();
+}
Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.c (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.c 2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,79 @@
+/*
+ * uic64dtv.c
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <stdio.h>
+
+#include "uilib.h"
+#include "uimenu.h"
+#include "uic64dtv.h"
+#include "uips2mouse.h"
+
+UI_MENU_DEFINE_RADIO(DtvRevision)
+UI_MENU_DEFINE_TOGGLE(c64dtvromrw)
+UI_MENU_DEFINE_TOGGLE(HummerUserportJoy)
+UI_MENU_DEFINE_RADIO(HummerUserportJoyPort)
+UI_MENU_DEFINE_TOGGLE(PS2Mouse)
+UI_MENU_DEFINE_TOGGLE(Mouse)
+
+UI_CALLBACK(set_c64dtv_rom_name)
+{
+ uilib_select_string((char *)UI_MENU_CB_PARAM, _("C64DTV ROM image name"),
+ _("Name:"));
+}
+
+static ui_menu_entry_t c64dtv_revision_submenu[] = {
+ { "*DTV2", (ui_callback_t)radio_DtvRevision,
+ (ui_callback_data_t)2, NULL },
+ { "*DTV3", (ui_callback_t)radio_DtvRevision,
+ (ui_callback_data_t)3, NULL },
+ { NULL }
+};
+
+static ui_menu_entry_t c64dtv_hummer_joy_submenu[] = {
+ { "*Joy1", (ui_callback_t)radio_HummerUserportJoyPort,
+ (ui_callback_data_t)1, NULL },
+ { "*Joy2", (ui_callback_t)radio_HummerUserportJoyPort,
+ (ui_callback_data_t)2, NULL },
+ { NULL }
+};
+
+ui_menu_entry_t c64dtv_submenu[] = {
+ { N_("C64DTV ROM image name..."),
+ (ui_callback_t)set_c64dtv_rom_name,
+ (ui_callback_data_t)"c64dtvromfilename", NULL },
+ { N_("C64DTV blitter revision"),
+ NULL, NULL, c64dtv_revision_submenu },
+ { N_("*Enable writes to C64DTV ROM image"),
+ (ui_callback_t)toggle_c64dtvromrw, NULL, NULL },
+ { N_("*Enable Hummer Userport joystick"),
+ (ui_callback_t)toggle_HummerUserportJoy, NULL, NULL },
+ { N_("Hummer joystick port mapped to Userport"),
+ NULL, NULL, c64dtv_hummer_joy_submenu },
+ { N_("PS/2 mouse on Userport"),
+ NULL, NULL, ps2_mouse_submenu },
+};
Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.h
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.h (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uic64dtv.h 2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,32 @@
+/*
+ * uic64dtv.h
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#ifndef _UI_C64DTV_H
+#define _UI_C64DTV_H
+
+extern struct ui_menu_entry_s c64dtv_submenu[];
+
+#endif
Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.c 2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.c 2008-07-10 08:46:59 UTC (rev 18990)
@@ -35,6 +35,7 @@
UI_MENU_DEFINE_TOGGLE(DriveTrueEmulation)
+UI_MENU_DEFINE_TOGGLE(FlashTrueFS)
UI_MENU_DEFINE_RADIO(Drive8ExtendImagePolicy)
UI_MENU_DEFINE_RADIO(Drive9ExtendImagePolicy)
UI_MENU_DEFINE_RADIO(Drive10ExtendImagePolicy)
@@ -184,3 +185,8 @@
{ NULL }
};
+ui_menu_entry_t ui_flash_options_submenu[] = {
+ { N_("*Enable true flash filesystem emulation"),
+ (ui_callback_t)toggle_FlashTrueFS, NULL, NULL },
+ { NULL }
+};
\ No newline at end of file
Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.h
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.h 2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrive.h 2008-07-10 08:46:59 UTC (rev 18990)
@@ -30,6 +30,7 @@
#include "uimenu.h"
extern struct ui_menu_entry_s ui_drive_options_submenu[];
+extern struct ui_menu_entry_s ui_flash_options_submenu[];
extern UI_CALLBACK(uidrive_extend_policy_control);
Copied: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.c (from rev 18985, branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64.c)
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.c (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.c 2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,104 @@
+/*
+ * uidrivec64.c
+ *
+ * Written by
+ * Andreas Boose <vic...@t-...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <stdio.h>
+
+#include "resources.h"
+#include "uidrive.h"
+#include "uidrivec64.h"
+#include "uidrivec64c128.h"
+#include "uidrivec64vic20.h"
+#include "uidriveiec.h"
+#include "uimenu.h"
+
+
+UI_MENU_DEFINE_TOGGLE(DriveTrueEmulation)
+UI_MENU_DEFINE_TOGGLE(FlashTrueFS)
+
+static ui_menu_entry_t drivec64dtv_settings_submenu[] = {
+ { N_("*Enable true drive emulation"),
+ (ui_callback_t)toggle_DriveTrueEmulation, NULL, NULL },
+ { N_("*Enable true flash filesystem"),
+ (ui_callback_t)toggle_FlashTrueFS, NULL, NULL },
+ { "--" },
+ { N_("Drive #8 model"),
+ NULL, NULL, uidrivec64vic20_set_drive0_type_submenu },
+ { N_("*Drive #8 expansion"),
+ (ui_callback_t)uidriveiec_expansion_control, (ui_callback_data_t)0,
+ uidrivec64c128_drive0_expansion_submenu },
+ { N_("*Drive #8 40-track image support"),
+ (ui_callback_t)uidrive_extend_policy_control, (ui_callback_data_t)0,
+ set_drive0_extend_image_policy_submenu },
+ { N_("*Drive #8 idle method"),
+ (ui_callback_t)uidriveiec_idle_method_control, (ui_callback_data_t)0,
+ set_drive0_idle_method_submenu },
+ { "--" },
+ { N_("Drive #9 model"),
+ NULL, NULL, uidrivec64vic20_set_drive1_type_submenu },
+ { N_("*Drive #9 expansion"),
+ (ui_callback_t)uidriveiec_expansion_control, (ui_callback_data_t)1,
+ uidrivec64c128_drive1_expansion_submenu },
+ { N_("*Drive #9 40-track image support"),
+ (ui_callback_t)uidrive_extend_policy_control, (ui_callback_data_t)1,
+ set_drive1_extend_image_policy_submenu },
+ { N_("*Drive #9 idle method"),
+ (ui_callback_t)uidriveiec_idle_method_control, (ui_callback_data_t)1,
+ set_drive1_idle_method_submenu },
+ { "--" },
+ { N_("Drive #10 model"),
+ NULL, NULL, uidrivec64vic20_set_drive2_type_submenu },
+ { N_("*Drive #10 expansion"),
+ (ui_callback_t)uidriveiec_expansion_control, (ui_callback_data_t)2,
+ uidrivec64c128_drive2_expansion_submenu },
+ { N_("*Drive #10 40-track image support"),
+ (ui_callback_t)uidrive_extend_policy_control, (ui_callback_data_t)2,
+ set_drive2_extend_image_policy_submenu },
+ { N_("*Drive #10 idle method"),
+ (ui_callback_t)uidriveiec_idle_method_control, (ui_callback_data_t)2,
+ set_drive2_idle_method_submenu },
+ { "--" },
+ { N_("Drive #11 model"),
+ NULL, NULL, uidrivec64vic20_set_drive3_type_submenu },
+ { N_("*Drive #11 expansion"),
+ (ui_callback_t)uidriveiec_expansion_control, (ui_callback_data_t)3,
+ uidrivec64c128_drive3_expansion_submenu },
+ { N_("*Drive #11 40-track image support"),
+ (ui_callback_t)uidrive_extend_policy_control, (ui_callback_data_t)3,
+ set_drive3_extend_image_policy_submenu },
+ { N_("*Drive #11 idle method"),
+ (ui_callback_t)uidriveiec_idle_method_control, (ui_callback_data_t)3,
+ set_drive3_idle_method_submenu },
+ { NULL }
+};
+
+ui_menu_entry_t ui_drivec64dtv_settings_menu[] = {
+ { N_("Drive settings"),
+ NULL, NULL, drivec64dtv_settings_submenu },
+ { NULL }
+};
+
Copied: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.h (from rev 18985, branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64.h)
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.h (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uidrivec64dtv.h 2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,35 @@
+/*
+ * uidrivec64.h
+ *
+ * Written by
+ * Andreas Boose <vic...@t-...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#ifndef _UIDRIVEC64_H
+#define _UIDRIVEC64_H
+
+#include "uimenu.h"
+
+extern struct ui_menu_entry_s ui_drivec64dtv_settings_menu[];
+
+#endif
+
Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.c (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.c 2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,47 @@
+/*
+ * uips2mouse.c
+ *
+ * Written by
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#ifdef HAVE_MOUSE
+
+#include <stdio.h>
+
+#include "uimenu.h"
+#include "uips2mouse.h"
+
+
+UI_MENU_DEFINE_TOGGLE(Mouse)
+UI_MENU_DEFINE_TOGGLE(ps2mouse)
+
+ui_menu_entry_t ps2_mouse_submenu[] = {
+ { N_("*Enable PS/2 mouse"),
+ (ui_callback_t)toggle_ps2mouse, NULL, NULL },
+ { N_("*Grab mouse events"),
+ (ui_callback_t)toggle_Mouse, NULL, NULL, KEYSYM_m, UI_HOTMOD_META },
+};
+
+#endif
Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.h
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.h (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uips2mouse.h 2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,34 @@
+/*
+ * uimouse.h
+ *
+ * Written by
+ * Andreas Boose <vic...@t-...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#ifndef _UIPS2MOUSE_H
+#define _UIPS2MOUSE_H
+
+#include "uimenu.h"
+
+extern struct ui_menu_entry_s ps2_mouse_submenu[];
+
+#endif
Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uisid.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uisid.c 2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/gui/uisid.c 2008-07-10 08:46:59 UTC (rev 18990)
@@ -74,6 +74,10 @@
(ui_callback_t)radio_SidModel, (ui_callback_data_t)1, NULL },
{ N_("*8580 + digi boost"),
(ui_callback_t)radio_SidModel, (ui_callback_data_t)2, NULL },
+ { N_("*6581R4 (not yet implemented)"),
+ (ui_callback_t)radio_SidModel, (ui_callback_data_t)3, NULL },
+ { N_("*DTVSID"),
+ (ui_callback_t)radio_SidModel, (ui_callback_data_t)4, NULL },
{ NULL }
};
Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/icon.h
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/icon.h 2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/icon.h 2008-07-10 08:46:59 UTC (rev 18990)
@@ -29,10 +29,10 @@
extern const char *c128_icon_data[];
extern const char *c64_icon_data[];
+extern const char *c64dtv_icon_data[];
extern const char *cbm2_icon_data[];
extern const char *pet_icon_data[];
extern const char *plus4_icon_data[];
extern const char *vic20_icon_data[];
#endif
-
Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/skyos/icons/x64dtv.ico
===================================================================
(Binary files differ)
Property changes on: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/skyos/icons/x64dtv.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/Makefile.am
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/Makefile.am 2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/Makefile.am 2008-07-10 08:46:59 UTC (rev 18990)
@@ -24,6 +24,7 @@
libx11ui_a_SOURCES = \
c128icon.c \
c64icon.c \
+ c64dtvicon.c \
cbm2icon.c \
fullscreen.c \
peticon.c \
Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/c64dtvicon.c
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/c64dtvicon.c (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/c64dtvicon.c 2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,578 @@
+/* XPM */
+const char * c64dtv_icon_data[] = {
+"48 42 533 2",
+" c None",
+". c #C7C3C7",
+"+ c #C0BCC0",
+"@ c #9C9B9C",
+"# c #696869",
+"$ c #6F6E6F",
+"% c #919091",
+"& c #B8B5B8",
+"* c #C8C7C8",
+"= c #E5E6E5",
+"- c #B6B8B6",
+"; c #5D605D",
+"> c #5B5E5B",
+", c #5F615F",
+"' c #686A68",
+") c #9A999A",
+"! c #C4C1C4",
+"~ c #C1BFC1",
+"{ c #BCC0BC",
+"] c #A5A8A5",
+"^ c #7A7D7A",
+"/ c #6E716E",
+"( c #767A76",
+"_ c #7F827F",
+": c #707370",
+"< c #646764",
+"[ c #9E9D9E",
+"} c #C6C2C6",
+"| c #CBCDCB",
+"1 c #E7E9E7",
+"2 c #B0B2B0",
+"3 c #999C99",
+"4 c #858885",
+"5 c #848784",
+"6 c #C5C8C5",
+"7 c #B1B4B1",
+"8 c #6A6D6A",
+"9 c #6D6F6D",
+"0 c #C2BEC2",
+"a c #C1BEC1",
+"b c #DFE1DF",
+"c c #FAFAFA",
+"d c #D1D4D1",
+"e c #CDD0CD",
+"f c #646664",
+"g c #8F928F",
+"h c #9B9D9B",
+"i c #696C69",
+"j c #585B58",
+"k c #A7A4A7",
+"l c #BCBABC",
+"m c #ABAFAB",
+"n c #888B88",
+"o c #848684",
+"p c #4C4E4C",
+"q c #232423",
+"r c #2B2C2B",
+"s c #434543",
+"t c #393B39",
+"u c #939193",
+"v c #BCB9BC",
+"w c #5F625F",
+"x c #4D4F4D",
+"y c #4A4C4A",
+"z c #383A38",
+"A c #1D1E1D",
+"B c #060706",
+"C c #020202",
+"D c #0C0D0C",
+"E c #161716",
+"F c #131313",
+"G c #A7A3A7",
+"H c #C4C0C4",
+"I c #525152",
+"J c #171717",
+"K c #181918",
+"L c #0D0D0D",
+"M c #030303",
+"N c #000000",
+"O c #010101",
+"P c #2F2E2F",
+"Q c #7E7C7E",
+"R c #363536",
+"S c #3A393A",
+"T c #626062",
+"U c #989598",
+"V c #565456",
+"W c #484748",
+"X c #979397",
+"Y c #3D3B3D",
+"Z c #B7B3B7",
+"` c #A5A2A5",
+" . c #171617",
+".. c #131213",
+"+. c #939093",
+"@. c #646264",
+"#. c #737173",
+"$. c #0D0C0D",
+"%. c #525052",
+"&. c #ABA7AB",
+"*. c #827F82",
+"=. c #ACA9AC",
+"-. c #323132",
+";. c #9C999C",
+">. c #343334",
+",. c #060606",
+"'. c #040404",
+"). c #2D2C2D",
+"!. c #949194",
+"~. c #5C5A5C",
+"{. c #121212",
+"]. c #B7B4B7",
+"^. c #959295",
+"/. c #BDB9BD",
+"(. c #1F1E1F",
+"_. c #716E71",
+":. c #BEBABE",
+"<. c #212021",
+"[. c #747274",
+"}. c #A19EA1",
+"|. c #494949",
+"1. c #4E4D4E",
+"2. c #C1BDC1",
+"3. c #636163",
+"4. c #797779",
+"5. c #AFABAF",
+"6. c #595759",
+"7. c #383738",
+"8. c #A09CA0",
+"9. c #070707",
+"0. c #B5B1B5",
+"a. c #818181",
+"b. c #121312",
+"c. c #535153",
+"d. c #646164",
+"e. c #6B696B",
+"f. c #0A0A0A",
+"g. c #B3B0B3",
+"h. c #0E0E0E",
+"i. c #575557",
+"j. c #7A7A7A",
+"k. c #141514",
+"l. c #414141",
+"m. c #B0ACB0",
+"n. c #9F9C9F",
+"o. c #222222",
+"p. c #C3BFC3",
+"q. c #1A1A1A",
+"r. c #090909",
+"s. c #7B787B",
+"t. c #6F706F",
+"u. c #2F2F2F",
+"v. c #C2BBBF",
+"w. c #C7C1C5",
+"x. c #292829",
+"y. c #A9A6A9",
+"z. c #5E5C5E",
+"A. c #B2AEB2",
+"B. c #666766",
+"C. c #1F1918",
+"D. c #9B3334",
+"E. c #A84647",
+"F. c #B67E80",
+"G. c #C6C1C5",
+"H. c #C5C1C5",
+"I. c #C2BFC2",
+"J. c #A8A6A8",
+"K. c #575957",
+"L. c #101010",
+"M. c #130F0E",
+"N. c #870808",
+"O. c #9B0101",
+"P. c #8B0606",
+"Q. c #7F7374",
+"R. c #AFACAF",
+"S. c #C5C2C5",
+"T. c #8D8C8D",
+"U. c #696B69",
+"V. c #555855",
+"W. c #101110",
+"X. c #0D0E0E",
+"Y. c #483C3A",
+"Z. c #572F2E",
+"`. c #2F1716",
+" + c #3C3E3C",
+".+ c #535553",
+"++ c #6D6E6D",
+"@+ c #9C9A9C",
+"#+ c #BDBABD",
+"$+ c #A09EA0",
+"%+ c #777877",
+"&+ c #5D5F5D",
+"*+ c #545654",
+"=+ c #545754",
+"-+ c #595755",
+";+ c #111111",
+">+ c #3D3A38",
+",+ c #4E4F4C",
+"'+ c #494B49",
+")+ c #484A48",
+"!+ c #505250",
+"~+ c #525452",
+"{+ c #616361",
+"]+ c #868686",
+"^+ c #B0ADB0",
+"/+ c #A5A3A5",
+"(+ c #7F7F7F",
+"_+ c #636463",
+":+ c #444544",
+"<+ c #393A39",
+"[+ c #454240",
+"}+ c #4D2F2E",
+"|+ c #582A28",
+"1+ c #0E0F0E",
+"2+ c #561414",
+"3+ c #771A19",
+"4+ c #583937",
+"5+ c #474A47",
+"6+ c #4A4D4A",
+"7+ c #515351",
+"8+ c #4F524F",
+"9+ c #4D504D",
+"0+ c #555755",
+"a+ c #707170",
+"b+ c #9B9A9B",
+"c+ c #B4B1B4",
+"d+ c #8E8D8E",
+"e+ c #707070",
+"f+ c #5C5F5C",
+"g+ c #5F1918",
+"h+ c #680A0A",
+"i+ c #581F1E",
+"j+ c #3E3D3B",
+"k+ c #070606",
+"l+ c #570B0B",
+"m+ c #990202",
+"n+ c #910C0C",
+"o+ c #4F4C4A",
+"p+ c #535653",
+"q+ c #525552",
+"r+ c #656765",
+"s+ c #888888",
+"t+ c #B1AFB1",
+"u+ c #A6A4A6",
+"v+ c #808080",
+"w+ c #5E605E",
+"x+ c #464846",
+"y+ c #606260",
+"z+ c #6F726F",
+"A+ c #6C6F6C",
+"B+ c #656865",
+"C+ c #636563",
+"D+ c #5B5D5B",
+"E+ c #7B1918",
+"F+ c #A30909",
+"G+ c #A30A0A",
+"H+ c #871313",
+"I+ c #630606",
+"J+ c #6C0202",
+"K+ c #980101",
+"L+ c #900101",
+"M+ c #510E0E",
+"N+ c #585A58",
+"O+ c #575A57",
+"P+ c #565956",
+"Q+ c #343634",
+"R+ c #515451",
+"S+ c #634E4C",
+"T+ c #7F3A39",
+"U+ c #A54748",
+"V+ c #B95E60",
+"W+ c #BE8184",
+"X+ c #C5B6BA",
+"Y+ c #A4A3A3",
+"Z+ c #7E807E",
+"`+ c #737472",
+" @ c #585957",
+".@ c #383938",
+"+@ c #212321",
+"@@ c #363736",
+"#@ c #6D706D",
+"$@ c #676A67",
+"%@ c #5F5654",
+"&@ c #5E2927",
+"*@ c #5F1010",
+"=@ c #560808",
+"-@ c #4F0605",
+";@ c #460505",
+">@ c #350E0D",
+",@ c #27201F",
+"'@ c #595C59",
+")@ c #5A5D5A",
+"!@ c #454845",
+"~@ c #574A47",
+"{@ c #A10C0B",
+"]@ c #AF0000",
+"^@ c #B00000",
+"/@ c #B10000",
+"(@ c #B20000",
+"_@ c #B42829",
+":@ c #B6A9AC",
+"<@ c #A8A9A8",
+"[@ c #A8ABA8",
+"}@ c #A09E9C",
+"|@ c #977876",
+"1@ c #AC5554",
+"2@ c #835453",
+"3@ c #5B5958",
+"4@ c #1E1F1E",
+"5@ c #1F211F",
+"6@ c #313231",
+"7@ c #676967",
+"8@ c #636562",
+"9@ c #61615E",
+"0@ c #5A5A58",
+"a@ c #4E504E",
+"b@ c #565856",
+"c@ c #3B3D3B",
+"d@ c #171817",
+"e@ c #080908",
+"f@ c #362927",
+"g@ c #7F0101",
+"h@ c #A10000",
+"i@ c #A50000",
+"j@ c #950000",
+"k@ c #5B0909",
+"l@ c #5B5957",
+"m@ c #A6A3A6",
+"n@ c #797A79",
+"o@ c #928D8A",
+"p@ c #885C5B",
+"q@ c #832E2D",
+"r@ c #6D403F",
+"s@ c #8D4A49",
+"t@ c #A13A3A",
+"u@ c #862423",
+"v@ c #441E1D",
+"w@ c #1F1F1E",
+"x@ c #1E201E",
+"y@ c #2D2F2D",
+"z@ c #4B4D4B",
+"A@ c #636663",
+"B@ c #686B68",
+"C@ c #616461",
+"D@ c #606360",
+"E@ c #2E302E",
+"F@ c #3D3E3D",
+"G@ c #555653",
+"H@ c #5B2F2E",
+"I@ c #571413",
+"J@ c #260909",
+"K@ c #1A0908",
+"L@ c #180F0F",
+"M@ c #2E2E2D",
+"N@ c #424442",
+"O@ c #323432",
+"P@ c #4C4C4C",
+"Q@ c #A7A5A7",
+"R@ c #626461",
+"S@ c #6A6967",
+"T@ c #7A7472",
+"U@ c #7B6260",
+"V@ c #CF3030",
+"W@ c #DA3131",
+"X@ c #CA2929",
+"Y@ c #731717",
+"Z@ c #261C1B",
+"`@ c #2D201F",
+" # c #24201F",
+".# c #1F201F",
+"+# c #202120",
+"@# c #474947",
+"## c #666966",
+"$# c #626462",
+"%# c #252625",
+"&# c #080808",
+"*# c #454745",
+"=# c #60605D",
+"-# c #595A57",
+";# c #3D3F3D",
+"># c #282928",
+",# c #272827",
+"'# c #292B29",
+")# c #918F91",
+"!# c #909090",
+"~# c #626562",
+"{# c #6F6B68",
+"]# c #532B2A",
+"^# c #351817",
+"/# c #281919",
+"(# c #782222",
+"_# c #BF2828",
+":# c #C52221",
+"<# c #9E1A1A",
+"[# c #2E1918",
+"}# c #444644",
+"|# c #424342",
+"1# c #1A1B1A",
+"2# c #2B2D2B",
+"3# c #4E514E",
+"4# c #5E615E",
+"5# c #595B59",
+"6# c #3E403E",
+"7# c #2C2D2C",
+"8# c #262726",
+"9# c #242524",
+"0# c #4E4E4E",
+"a# c #666566",
+"b# c #3F413F",
+"c# c #6B6E6B",
+"d# c #6F706E",
+"e# c #882525",
+"f# c #A41D1D",
+"g# c #A41B1B",
+"h# c #711111",
+"i# c #3E1717",
+"j# c #571F1F",
+"k# c #471919",
+"l# c #281F1E",
+"m# c #373837",
+"n# c #5A5C5A",
+"o# c #242624",
+"p# c #232523",
+"q# c #1C1D1C",
+"r# c #161616",
+"s# c #8E8B8E",
+"t# c #5C5E5C",
+"u# c #606361",
+"v# c #5C5351",
+"w# c #413938",
+"x# c #353332",
+"y# c #593130",
+"z# c #C91F1F",
+"A# c #D11B1B",
+"B# c #CC1717",
+"C# c #831211",
+"D# c #1A1918",
+"E# c #070807",
+"F# c #262826",
+"G# c #252725",
+"H# c #1B1C1B",
+"I# c #272627",
+"J# c #BBB7BB",
+"K# c #B9B5B9",
+"L# c #201F20",
+"M# c #1B1B1B",
+"N# c #464946",
+"O# c #604442",
+"P# c #6D1111",
+"Q# c #711010",
+"R# c #610E0E",
+"S# c #451615",
+"T# c #70201F",
+"U# c #801818",
+"V# c #621514",
+"W# c #5B4D4B",
+"X# c #303230",
+"Y# c #222422",
+"Z# c #222322",
+"`# c #0B0C0B",
+" $ c #878587",
+".$ c #807E80",
+"+$ c #050505",
+"@$ c #5A5C59",
+"#$ c #54514F",
+"$$ c #982A29",
+"%$ c #D01414",
+"&$ c #D11111",
+"*$ c #C80F0F",
+"=$ c #7B3735",
+"-$ c #6C706C",
+";$ c #6D716D",
+">$ c #2D2E2D",
+",$ c #3D3C3D",
+"'$ c #0B0B0B",
+")$ c #592F2E",
+"!$ c #4F0D0C",
+"~$ c #4D0909",
+"{$ c #380E0E",
+"]$ c #474442",
+"^$ c #717471",
+"/$ c #727672",
+"($ c #727572",
+"_$ c #212221",
+":$ c #090A09",
+"<$ c #1D1C1D",
+"[$ c #454345",
+"}$ c #292A29",
+"|$ c #5A5B59",
+"1$ c #777A77",
+"2$ c #767976",
+"3$ c #202220",
+"4$ c #1E1E1E",
+"5$ c #777477",
+"6$ c #BCB8BC",
+"7$ c #1E1D1E",
+"8$ c #858285",
+"9$ c #252425",
+"0$ c #0C0C0C",
+"a$ c #333433",
+"b$ c #4F514F",
+"c$ c #2F302F",
+"d$ c #131413",
+"e$ c #767376",
+"f$ c #B8B4B8",
+"g$ c #191919",
+"h$ c #111211",
+"i$ c #373937",
+"j$ c #505350",
+"k$ c #2A2C2A",
+"l$ c #1C1C1C",
+"m$ c #706E70",
+"n$ c #5C5B5C",
+"o$ c #151615",
+"p$ c #6D6A6D",
+"q$ c #A8A5A8",
+"r$ c #4B494B",
+"s$ c #0F100F",
+"t$ c #151515",
+"u$ c #6E6C6E",
+"v$ c #393839",
+"w$ c #020302",
+"x$ c #6F6D6F",
+"y$ c #BAB6BA",
+"z$ c #8D8B8D",
+"A$ c #1C1B1C",
+"B$ c #6A686A",
+"C$ c #767476",
+"D$ c #1D1D1D",
+"E$ c #6C6A6C",
+"F$ c #615F61",
+"G$ c #181818",
+"H$ c #686668",
+". . . . . . . . . . . . . . . . . . . + @ # $ % & . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . * = - ; > , ' ) ! . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . ~ { ] ^ / ( _ : < [ . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . } | 1 2 3 4 5 6 7 8 9 0 . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . a b c d e 5 f g h i j k . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . l m ] n o p q r s s t u . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . v w x y z A B C D E F G . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . H I J K L M N N N O P H Q R R S T + U R R R R R V W . . X Y Z Z ",
+". . . . . . . . . . . . . . . . . ` .O N N N N N ..+.. @.N #.T $.%.&.#.V N V #.*.O =.. %.-.H H ",
+". . . . . . . . . . . . . . . . . . ;.>.,.O N '.).!.} . @.N . . ~.{.].. ^.N ^.. /.(._.:.<.[.. . ",
+". . . . . . . . . . . . . . . . . . . 0 }.|.O 1.2.. . . 3.N . . 4.C 5.. ^.N ^.. . 6.7.8.9.0.. . ",
+". . . . . . . . . . . . . . . . . . . . . a.b.c.. . . . d.N . . e.f.g.. ^.N ^.. . ;.h.i.R . . . ",
+". . . . . . . . . . . . . . . . . . . . . j.k.l.. . . . @.N m.n.o.R p.. ^.N ^.. . } q.r.s.. . . ",
+". . . . . . . . . . . . . . . . . . . . . t.b.u.v.w.. . @.N N M x.y.. . ^.N ^.. . . z.h.A.. . . ",
+". . . . . . . . . . . . . . . . . . . . } B.k.C.D.E.F.G.H + + 2.H . . . H.+ H.. . . H 2.. . . . ",
+". . . . . . . . . . . . . . . . . . . I.J.K.L.M.N.O.P.Q.R.H.. . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . S.0.T.U.V.y W.X.Y.Z.`. +.+++@+#+. . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . } #+$+%+&+*+=+-+y ;+L >+,+'+)+x !+~+{+]+^+H . . . . . . . . . . . . . ",
+". . . . . . . . . . . a /+(+_+:+<+ +[+}+|+s 1+f.2+3+4+5+6+7+~+8+9+0+a+b+/.} . . . . . . . . . . ",
+". . . . . . . . S.c+d+e+.+*+f+j p +g+h+i+j+L k+l+m+n+o+~+p+p+p+q+0+=+K.r+s+t+H.. . . . . . . . ",
+". . . . . . + u+v+w+x+y+z+A+i B+C+D+E+F+G+H+I+J+K+L+M+x j N+O+P+O+x Q+R+O+S+T+U+V+W+X+. . . . . ",
+". . . } l Y+Z+`+D+ @.@+@@@K.9 #@$@B+%@&@*@=@-@;@>@,@x+'@)@'@O+!@q B 9.'+~@{@]@^@/@(@_@:@} . . . ",
+". . t+<@[@}@|@1@2@3@z 4@4@5@6@7+7@i B+8@9@0@a@!+0+b@K.> p+c@d@'.N N e@p f@g@h@i@i@j@k@l@j.m@. . ",
+". 0 n@#@4 o@p@q@r@s@t@u@v@w@x@q y@z@A@B@B@< < C@D@> !+E@h.C N N M E F@D+G@H@I@J@K@L@M@N@O@P@:.. ",
+". Q@< < r+R@S@T@U@V@W@X@Y@Z@`@ #.#+#E@@#, i ##$#z@%#&#N N N ,..#*#)@w w D@D@=#-#8+;#y@>#,#'#)#. ",
+"! !#~#A@C@~#w #@{#]#^#/#(#_#:#<#[#4@4@+@,#}#|#1#M N N N f.2#3#4#C@D@C@~#A@A@5#6#7#8#,#%#9#8#0#I.",
+"} a#b#> w 4#w C@w A@c#d#e#f#g#h#i#j#k#l#+@4@9.N N O b.m#n#< C@~#A@B+##< q+<+'#8#%#%#o#%#p#q#r#` ",
+"} s#C K N@j t#w D@f+&+u#v#w#x#y#z#A#B#C#D#4@E#'.A *#w+##B+< B+##B@< 8+Q+F#%#o#G#p#9#+@H#D O I#J#",
+". K#L#N M M#N#D+t#j D+t#$#~#A+O#P#Q#R#S#T#U#V#W#$@8 i B@$@##$@D@a@X#8#o#p#q 9#Y#Z#1#`#C N '. $. ",
+". . .$C N N +$+#'+'@&+> > 0+f+@$#$x 7+$$%$&$*$=$B@8 -$#@;$< x+>$%#Y#q 9#Y#Y#Z#K f.C N N N ,$2.. ",
+". . H 6.'$N N N '.G#3#O+N+K.j K.'@f+< )$!$~${$]$^$/$($C+N@>#9#Z#Z#Z#_$_$_$K :$O N N N O <$G . . ",
+". . . . m@[$'.N N N E#}$3#O+N+O+)@)@O+&+|$C@/ 1$2${+6#Y#3$3$q _$+#+#.#E r.O N N N N 4$5$6$. . . ",
+". . . . . S.^.>.M N N N r.>$9+P+=+P+N+K.'@w+8 D@@@3$_$5@+#4@x@+#4@k.E#N N N N O 7$#.:.. . . . . ",
+". . . . . . . + 8$9$C N N O 0$a$b$q+j )@)@N+'@c$A .#A .#4@A A d$9.O N N N O 7$e$f$. . . . . . . ",
+". . . . . . . . . J#_.g$N N N O h$i$j$=+V.V.N+k$A q#A A H#h$,.O N N N O l$m$].. . . . . . . . . ",
+". . . . . . . . . . . g.n$h.N N N C o$ +~+K.p+}$H#H#K ;++$N N N N O q.p$f$. . . . . . . . . . . ",
+". . . . . . . . . . . . . q$r$'.N N N C K N@7+,#K s$'.N N N N N t$u$K#. . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . } ;.v$M N N N w$H#o$M N N N N N q.x$y$. . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . 2.z$x.C N N N N N N N O A$B$f$. . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . 6$C$D$O N N N O J E$0.. . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ].F$;+O G$H$g.. . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . =.4.f$. . . . . . . . . . . . . . . . . . . . . . . "};
Modified: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/xaw/Makefile.am
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/xaw/Makefile.am 2008-07-09 19:42:05 UTC (rev 18989)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/unix/x11/xaw/Makefile.am 2008-07-10 08:46:59 UTC (rev 18990)
@@ -7,6 +7,7 @@
-I$(top_srcdir)/src/drive \
-I$(top_srcdir)/src/vdrive \
-I$(top_srcdir)/src/c64 \
+ -I$(top_srcdir)/src/c64dtv \
-I$(top_srcdir)/src/c128 \
-I$(top_srcdir)/src/vic20 \
-I$(top_srcdir)/src/pet \
Added: branches/viceplus/v1.22.24-x64dtv/vice/src/arch/win32/resc64dtv.rc
===================================================================
--- branches/viceplus/v1.22.24-x64dtv/vice/src/arch/win32/resc64dtv.rc (rev 0)
+++ branches/viceplus/v1.22.24-x64dtv/vice/src/arch/win32/resc64dtv.rc 2008-07-10 08:46:59 UTC (rev 18990)
@@ -0,0 +1,3130 @@
+// C64 specific resources.
+//
+
+#include "config.h"
+#include "debug.h"
+#include "config.h"
+#include "res.h"
+#include "rescommon.h"
+
+#pragma code_page(28591)
+
+#define FILE_DESCRIPTION "VicePlus C64DTV Emulator"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+// original and default ENGLISH version of menu
+
+IDR_MENUC64DTV MENU DISCARDABLE
+BEGIN
+ POPUP "&File"
+ BEGIN
+ MENUITEM "&Autostart disk image...", IDM_AUTOSTART
+ MENUITEM SEPARATOR
+ POPUP "Attach &disk image"
+ BEGIN
+ MENUITEM "Drive &8\tAlt+8", IDM_ATTACH_8
+ MENUITEM "Drive &9\tAlt+9", IDM_ATTACH_9
+ MENUITEM "Drive 1&0\tAlt+0", IDM_ATTACH_10
+ MENUITEM "Drive &11\tAlt+1", IDM_ATTACH_11
+ END
+ POPUP "D&etach disk image"
+ BEGIN
+ MENUITEM "Drive &8", IDM_DETACH_8
+ MENUITEM "Drive &9", IDM_DETACH_9
+ MENUITEM "Drive 1&0", IDM_DETACH_10
+ MENUITEM "Drive &11", IDM_DETACH_11
+ MENUITEM SEPARATOR
+ MENUITEM "&All\tAlt+A", IDM_DETACH_ALL
+ END
+ POPUP "DTV flash &rom image"
+ BEGIN
+ MENUITEM "Attach &flash rom image", IDM_ATTACH_DTV_FLASH
+ MENUITEM "&Detach flash rom image", IDM_DETACH_DTV_FLASH
+ MENUITEM "&Create new flash rom image", IDM_CREATE_DTV_FLASH
+ END
+ POPUP "&Flip list"
+ BEGIN
+ MENUITEM "&Add current image\tAlt+I", IDM_FLIP_ADD
+ MENUITEM "&Remove current image\tAlt+K", IDM_FLIP_REMOVE
+ MENUITEM "Attach &next image\tAlt+N", IDM_FLIP_NEXT
+ MENUITEM "Attach &previous image\tAlt+B", IDM_FLIP_PREVIOUS
+ MENUITEM SEPARATOR
+ MENUITEM "&Load flip list", IDM_FLIP_LOAD
+ MENUITEM "&Save flip list", IDM_FLIP_SAVE
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "&Pause\tAlt+Pause", IDM_PAUSE, CHECKED
+ MENUITEM "&Monitor\tAlt+M", IDM_MONITOR
+ POPUP "&Reset"
+ BEGIN
+ MENUITEM "&Hard\tCtrl+Alt+R", IDM_RESET_HARD
+ MENUITEM "&Soft\tAlt+R", IDM_RESET_SOFT
+ MENUITEM SEPARATOR
+ MENUITEM "Drive #&8", IDM_RESET_DRIVE8
+ MENUITEM "Drive #&9", IDM_RESET_DRIVE9
+ MENUITEM "Drive #1&0", IDM_RESET_DRIVE10
+ MENUITEM "Drive #&11", IDM_RESET_DRIVE11
+ END
+#ifdef DEBUG
+ POPUP "&Debug"
+ BEGIN
+ POPUP "M&ode"
+ BEGIN
+ MENUITEM "&Normal", IDM_DEBUG_MODE_NORMAL
+ MENUITEM "&Small", IDM_DEBUG_MODE_SMALL
+ MENUITEM "&History", IDM_DEBUG_MODE_HISTORY
+ MENUITEM "&History Autoplay", IDM_DEBUG_MODE_AUTOPLAY
+ END
+ MENUITEM "&Main CPU Trace\tAlt+F10", IDM_TOGGLE_MAINCPU_TRACE, CHECKED
+ MENUITEM "Drive&0 CPU Trace\tAlt+F11", IDM_TOGGLE_DRIVE0CPU_TRACE, CHECKED
+ MENUITEM "Drive&1 CPU Trace\tAlt+F12", IDM_TOGGLE_DRIVE1CPU_TRACE, CHECKED
+ END
+#endif
+ MENUITEM SEPARATOR
+ MENUITEM "E&xit\tAlt+X", IDM_EXIT
+ END
+ POPUP "Sna&pshot"
+ BEGIN
+ MENUITEM "Load snapshot &image...", IDM_SNAPSHOT_LOAD
+ MENUITEM "Save sna&pshot image...", IDM_SNAPSHOT_SAVE
+ MENUITEM "&Load quicksnapshot image\tAlt+L", IDM_LOADQUICK
+ MENUITEM "&Save quicksnapshot image\tAlt+S", IDM_SAVEQUICK
+ MENUITEM SEPARATOR
+ MENUITEM "Start/Stop &Recording History", IDM_EVENT_TOGGLE_RECORD
+ MENUITEM "Start/Stop Pl&ayback History", IDM_EVENT_TOGGLE_PLAYBACK
+ MENUITEM "Set Recording Milestone\tAlt+G", IDM_EVENT_SETMILESTONE
+ MENUITEM "Return to Milestone\tAlt+H", IDM_EVENT_RESETMILESTONE
+ POPUP "Recording start mode"
+ BEGIN
+ MENUITEM "&Save new snapshot", IDM_EVENT_START_MODE_SAVE
+ MENUITEM "&Load existing snapshot", IDM_EVENT_START_MODE_LOAD
+ MENUITEM "Start with &reset", IDM_EVENT_START_MODE_RESET
+ MENUITEM "Overwrite &Playback", IDM_EVENT_START_MODE_PLAYBACK
+ END
+ MENUITEM "Select History files/directory", IDM_EVENT_DIRECTORY
+ MENUITEM SEPARATOR
+ MENUITEM "Save/stop media file...\tAlt+C", IDM_MEDIAFILE
+ MENUITEM SEPARATOR
+ MENUITEM "Record Sound...", IDM_SOUND_RECORD_START
+ MENUITEM "Stop Sound Recording", IDM_SOUND_RECORD_STOP
+ MENUITEM SEPARATOR
+ MENUITEM "Netplay (experimental)...", IDM_NETWORK_SETTINGS
+ END
+ POPUP "&Options"
+ BEGIN
+ POPUP "&Refresh rate"
+ BEGIN
+ MENUITEM "&Auto", IDM_REFRESH_RATE_AUTO
+ MENUITEM "1/&1", IDM_REFRESH_RATE_1
+ MENUITEM "1/&2", IDM_REFRESH_RATE_2
+ MENUITEM "1/&3", IDM_REFRESH_RATE_3
+ MENUITEM "1/&4", IDM_REFRESH_RATE_4
+ MENUITEM "1/&5", IDM_REFRESH_RATE_5
+ MENUITEM "1/&6", IDM_REFRESH_RATE_6
+ MENUITEM "1/&7", IDM_REFRESH_RATE_7
+ MENUITEM "1/&8", IDM_REFRESH_RATE_8
+ MENUITEM "1/&9", IDM_REFRESH_RATE_9
+ MENUITEM "1/1&0", IDM_REFRESH_RATE_10
+#if 0
+ MENUITEM SEPARATOR
+ MENUITEM "&Custom", IDM_REFRESH_RATE_CUSTOM
+#endif
+ END
+ POPUP "&Maximum Speed"
+ BEGIN
+ MENUITEM "&200%", IDM_MAXIMUM_SPEED_200
+ MENUITEM "&100%", IDM_MAXIMUM_SPEED_100
+ MENUITEM "&50%", IDM_MAXIMUM_SPEED_50
+ MENUITEM "&20%", IDM_MAXIMUM_SPEED_20
+ MENUITEM "1&0%", IDM_MAXIMUM_SPEED_10
+ MENUITEM "No &limit", IDM_MAXIMUM_SPEED_NO_LIMIT
+ MENUITEM SEPARATOR
+ MENUITEM "&Custom", IDM_MAXIMUM_SPEED_CUSTOM
+ END
+ MENUITEM "&Warp mode\tAlt+W", IDM_TOGGLE_WARP_MODE, CHECKED
+ MENUITEM SEPARATOR
+ MENUITEM "Fullscreen\tAlt+D", IDM_TOGGLE_FULLSCREEN
+ MENUITEM "Always on Top", IDM_TOGGLE_ALWAYSONTOP
+ MENUITEM SEPARATOR
+ MENUITEM "Video &cache", IDM_TOGGLE_VIDEOCACHE, CHECKED
+ MENUITEM "&Double size", IDM_TOGGLE_DOUBLESIZE, CHECKED
+ MENUITEM "Dou&ble scan", IDM_TOGGLE_DOUBLESCAN, CHECKED
+ MENUITEM "PAL Emulation", IDM_TOGGLE_FASTPAL, CHECKED
+ MENUITEM "Scale2x", IDM_TOGGLE_SCALE2X, CHECKED
+ MENUITEM SEPARATOR
+ MENUITEM "Swap &Joystick\tAlt+J", IDM_SWAP_JOYSTICK
+ MENUITEM SEPARATOR
+ MENUITEM "&Sound playback", IDM_TOGGLE_SOUND, CHECKED
+ MENUITEM SEPARATOR
+ MENUITEM "&True drive emulation", IDM_TOGGLE_DRIVE_TRUE_EMULATION, CHECKED
+ MENUITEM "&True flash filesystem", IDM_TOGGLE_FLASH_TRUE_FILESYSTEM, CHECKED
+ MENUITEM "&Virtual device traps", IDM_TOGGLE_VIRTUAL_DEVICES
+ MENUITEM SEPARATOR
+ POPUP "Vide&o standard"
+ BEGIN
+ MENUITEM "&PAL-G", IDM_SYNC_FACTOR_PAL
+ MENUITEM "&NTSC-M", IDM_SYNC_FACTOR_NTSC
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Emulator &Identification", IDM_TOGGLE_EMUID
+ MENUITEM "&PS/2 mouse emulation", IDM_PS2MOUSE
+ MENUITEM "&Grab mouse events\tAlt+Q", IDM_MOUSE
+ END
+ POPUP "S&ettings"
+ BEGIN
+ MENUITEM "&Video settings...", IDM_VIDEO_SETTINGS
+ MENUITEM "&Peripheral settings...",IDM_DEVICEMANAGER
+ MENUITEM "&Drive settings...", IDM_DRIVE_SETTINGS
+ MENUITEM "VIC-II settings...", IDM_VICII_SETTINGS
+ MENUITEM "&Joystick settings...", IDM_JOY_SETTINGS
+ MENUITEM "&Keyboard settings...", IDM_KEYBOARD_SETTINGS
+ MENUITEM "S&ound settings...", IDM_SOUND_SETTINGS
+ MENUITEM "S&ID settings...", IDM_SID_SETTINGS
+ MENUITEM "&ROM settings...", IDM_ROM_SETTINGS
+ MENUITEM "RA&M settings...", IDM_RAM_SETTINGS
+ MENUITEM "&C64DTV settings...", IDM_C64DTV_SETTINGS
+ MENUITEM SEPARATOR
+ MENUITEM "&Save current settings", IDM_SETTINGS_SAVE
+ MENUITEM "&Load saved settings", IDM_SETTINGS_LOAD
+ MENUITEM "Set de&fault settings", IDM_SETTINGS_DEFAULT
+ MENUITEM SEPARATOR
+ MENUITEM "Save settings on e&xit", IDM_TOGGLE_SAVE_SETTINGS_ON_EXIT
+ MENUITEM "&Confirm on exit", IDM_TOGGLE_CONFIRM_ON_EXIT
+ END
+ POPUP "&Language"
+ BEGIN
+ MENUITEM "&English", IDM_LANG_EN
+ MENUITEM "&German", IDM_LANG_DE
+ MENUITEM "&French", IDM_LANG_FR
+ MENUITEM "&Hungarian", IDM_LANG_HU
+ MENUITEM "&Italian", IDM_LANG_IT
+ MENUITEM "&Dutch", IDM_LANG_NL
+ MENUITEM "&Polish", IDM_LANG_PL
+ MENUITEM "&Swedish", IDM_LANG_SV
+ END
+ POPUP "&Help"
+ BEGIN
+// MENUITEM "H&elp", IDM_HELP
+// MENUITEM SEPARATOR
+ MENUITEM "&About...", IDM_ABOUT
+ MENUITEM SEPARATOR
+ MENUITEM "Command line &options", IDM_CMDLINE
+ MENUITEM SEPARATOR
+ MENUITEM "&Contributors", IDM_CONTRIBUTORS
+ MENUITEM "&License", IDM_LICENSE
+ MENUITEM "No &warranty", IDM_WARRANTY
+ END
+END
+
+
+// GERMAN version of menu
+
+IDR_MENUC64DTV_DE MENU DISCARDABLE
+BEGIN
+ POPUP "&Datei"
+ BEGIN
+ MENUITEM "&Autostart Disk Image...", IDM_AUTOSTART
+ MENUITEM SEPARATOR
+ POPUP "&Disk Image einlegen"
+ BEGIN
+ MENUITEM "Laufwerk &8\tAlt+8", IDM_ATTACH_8
+ MENUITEM "Laufwerk &9\tAlt+9", IDM_ATTACH_9
+ MENUITEM "Laufwerk 1&0\tAlt+0", IDM_ATTACH_10
+ MENUITEM "Laufwerk &11\tAlt+1", IDM_ATTACH_11
+ END
+ POPUP "Disk Image &entfernen"
+ BEGIN
+ MENUITEM "Laufwerk &8", IDM_DETACH_8
+ MENUITEM "Laufwerk &9", IDM_DETACH_9
+ MENUITEM "Laufwerk 1&0", IDM_DETACH_10
+ MENUITEM "Laufwerk &11", IDM_DETACH_11
+ MENUITEM SEPARATOR
+ MENUITEM "&Alle\tAlt+A", IDM_DETACH_ALL
+ END
+ POPUP "&Flipliste"
+ BEGIN
+ MENUITEM "&Aktuelles Image hinzuf\xFCgen\tAlt+I", IDM_FLIP_ADD
+ MENUITEM "Aktuelles Image entfe&rnen\tAlt+K", IDM_FLIP_REMOVE
+ MENUITEM "N\xE4chstes Image\tAlt+N", IDM_FLIP_NEXT
+ MENUITEM "Voriges Image\tAlt+B", IDM_FLIP_PREVIOUS
+ MENUITEM SEPARATOR
+ MENUITEM "Fliplist Datei &Laden", IDM_FLIP_LOAD
+ MENUITEM "Fliplist Datei &Speichern", IDM_FLIP_SAVE
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "&Pause\tAlt+Pause", IDM_PAUSE, CHECKED
+ MENUITEM "&Monitor\tAlt+M", IDM_MONITOR
+ POPUP "&Reset"
+ BEGIN
+ MENUITEM "&Hart\tCtrl+Alt+R", IDM_RESET_HARD
+ MENUITEM "&Soft\tAlt+R", IDM_RESET_SOFT
+ MENUITEM SEPARATOR
+ MENUITEM "Laufwerk #&8", IDM_RESET_DRIVE8
+ MENUITEM "Laufwerk #&9", IDM_RESET_DRIVE9
+ MENUITEM "Laufwerk #1&0", IDM_RESET_DRIVE10
+ MENUITEM "Laufwerk #&11", IDM_RESET_DRIVE11
+ END
+#ifdef DEBUG
+ POPUP "&Debug"
+ BEGIN
+ POPUP "M&odus"
+ BEGIN
+ MENUITEM "&Normal", IDM_DEBUG_MODE_NORMAL
+ MENUITEM "&Klein", IDM_DEBUG_MODE_SMALL
+ MENUITEM "&History", IDM_DEBUG_MODE_HISTORY
+ MENUITEM "&History Automatische Wiedergabe", IDM_DEBUG_MODE_AUTOPLAY
+ END
+ MENUITEM "&Main CPU Trace\tAlt+F10", IDM_TOGGLE_MAINCPU_TRACE, CHECKED
+ MENUITEM "Laufwerk&0 CPU Trace\tAlt+F11", IDM_TOGGLE_DRIVE0CPU_TRACE, CHECKED
+ MENUITEM "Laufwerk&1 CPU Trace\tAlt+F12", IDM_TOGGLE_DRIVE1CPU_TRACE, CHECKED
+ END
+#endif
+ MENUITEM SEPARATOR
+ MENUITEM "E&xit\tAlt+X", IDM_EXIT
+ END
+ POPUP "Sna&pshot"
+ BEGIN
+ MENUITEM "Snapshot &Image Laden...", IDM_SNAPSHOT_LOAD
+ MENUITEM "Sna&pshot Image Speichern...", IDM_SNAPSHOT_SAVE
+ MENUITEM "Schnell&laden von Snapshot Image\tAlt+L", IDM_LOADQUICK
+ MENUITEM "&Schnellspeichern von Snapshot\tAlt+S", IDM_SAVEQUICK
+ MENUITEM SEPARATOR
+ MENUITEM "Sta&rt/Stop Aufnahme History", IDM_EVENT_TOGGLE_RECORD
+ MENUITEM "St&art/Stop Wiedergabe History", IDM_EVENT_TOGGLE_PLAYBACK
+ MEN...
[truncated message content] |