vice-emu-commit Mailing List for VICE (Page 1067)
Versatile Commodore Emulator
Brought to you by:
blackystardust,
gpz
Menu
▾
▴
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
(18) |
Nov
|
Dec
|
|
From: <bla...@us...> - 2008-06-01 16:33:26
|
Revision: 18819
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18819&view=rev
Author: blackystardust
Date: 2008-06-01 09:33:26 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
Added #include <strings.h> to some headers, which was needed for the SCO ports and fixed a typo (missing semi-colon)
Modified Paths:
--------------
branches/marco/ports/vice/po/intl2po.c
branches/marco/ports/vice/src/arch/unix/archdep.c
branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c
branches/marco/ports/vice/src/c1541.c
branches/marco/ports/vice/src/c64/patchrom.c
branches/marco/ports/vice/src/monitor/mon_assemble6502.c
branches/marco/ports/vice/src/monitor/mon_assemblez80.c
branches/marco/ports/vice/src/monitor/mon_command.c
branches/marco/ports/vice/src/monitor/monitor.c
branches/marco/ports/vice/src/resources.c
branches/marco/ports/vice/src/sound.c
branches/marco/ports/vice/src/util.c
branches/marco/ports/vice/src/zfile.c
Modified: branches/marco/ports/vice/po/intl2po.c
===================================================================
--- branches/marco/ports/vice/po/intl2po.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/po/intl2po.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -30,6 +30,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef _SCO_ELF
+#include <strings.h>
+#endif
+
/* status definitions */
#define SCANNING 0
#define STRINGTABLE_BEGIN_SCAN 1
Modified: branches/marco/ports/vice/src/arch/unix/archdep.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/archdep.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/arch/unix/archdep.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -44,6 +44,10 @@
#include <vfork.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "findpath.h"
#include "ioutil.h"
Modified: branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -68,7 +68,7 @@
static void pal_ctrl_reset (GtkWidget *w, gpointer data)
{
- unsigned int i
+ unsigned int i;
int tmp;
for (i = 0; i < sizeof(ctrls)/sizeof(ctrls[0]); i++)
Modified: branches/marco/ports/vice/src/c1541.c
===================================================================
--- branches/marco/ports/vice/src/c1541.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/c1541.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -54,6 +54,10 @@
#include <fcntl.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "cbmdos.h"
#include "cbmimage.h"
Modified: branches/marco/ports/vice/src/c64/patchrom.c
===================================================================
--- branches/marco/ports/vice/src/c64/patchrom.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/c64/patchrom.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -35,6 +35,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "log.h"
#include "c64memrom.h"
#include "patchrom.h"
Modified: branches/marco/ports/vice/src/monitor/mon_assemble6502.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_assemble6502.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/monitor/mon_assemble6502.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -30,6 +30,10 @@
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "asm.h"
#include "montypes.h"
#include "mon_assemble.h"
Modified: branches/marco/ports/vice/src/monitor/mon_assemblez80.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_assemblez80.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/monitor/mon_assemblez80.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -29,6 +29,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "asm.h"
#include "montypes.h"
#include "mon_assemble.h"
Modified: branches/marco/ports/vice/src/monitor/mon_command.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_command.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/monitor/mon_command.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -31,6 +31,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "mon_command.h"
#include "montypes.h"
#include "mon_parse.h" /* FIXME ! */
Modified: branches/marco/ports/vice/src/monitor/monitor.c
===================================================================
--- branches/marco/ports/vice/src/monitor/monitor.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/monitor/monitor.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -37,6 +37,10 @@
#include <direct.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "charset.h"
#include "cmdline.h"
Modified: branches/marco/ports/vice/src/resources.c
===================================================================
--- branches/marco/ports/vice/src/resources.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/resources.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -41,7 +41,7 @@
#include <string.h>
#include <ctype.h>
-#if 0
+#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
Modified: branches/marco/ports/vice/src/sound.c
===================================================================
--- branches/marco/ports/vice/src/sound.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/sound.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -34,6 +34,10 @@
#include <string.h>
#include <time.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "clkguard.h"
#include "cmdline.h"
Modified: branches/marco/ports/vice/src/util.c
===================================================================
--- branches/marco/ports/vice/src/util.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/util.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -33,6 +33,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "ioutil.h"
#include "lib.h"
Modified: branches/marco/ports/vice/src/zfile.c
===================================================================
--- branches/marco/ports/vice/src/zfile.c 2008-06-01 03:24:13 UTC (rev 18818)
+++ branches/marco/ports/vice/src/zfile.c 2008-06-01 16:33:26 UTC (rev 18819)
@@ -45,6 +45,10 @@
#include <zlib.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
#include "archdep.h"
#include "ioutil.h"
#include "lib.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-06-01 03:24:05
|
Revision: 18818
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18818&view=rev
Author: blackystardust
Date: 2008-05-31 20:24:13 -0700 (Sat, 31 May 2008)
Log Message:
-----------
Added the memmap feature from VICEplus, it is a feature that shows what memory places have been accessed and how. Because of the CPU overhead the feature is activated with the configure option --enable-memmap
Modified Paths:
--------------
branches/marco/ports/vice/configure.in
branches/marco/ports/vice/src/6510core.c
branches/marco/ports/vice/src/c64/c64mem.c
branches/marco/ports/vice/src/gfxoutput.h
branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/gifdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/iffdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/jpegdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/pcxdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/pngdrv.c
branches/marco/ports/vice/src/gfxoutputdrv/ppmdrv.c
branches/marco/ports/vice/src/maincpu.c
branches/marco/ports/vice/src/monitor/mon_command.c
branches/marco/ports/vice/src/monitor/mon_lex.c
branches/marco/ports/vice/src/monitor/mon_lex.l
branches/marco/ports/vice/src/monitor/mon_parse.c
branches/marco/ports/vice/src/monitor/mon_parse.h
branches/marco/ports/vice/src/monitor/mon_parse.y
branches/marco/ports/vice/src/monitor/monitor.c
branches/marco/ports/vice/src/monitor/montypes.h
branches/marco/ports/vice/src/monitor.h
branches/marco/ports/vice/src/screenshot.c
branches/marco/ports/vice/src/screenshot.h
Modified: branches/marco/ports/vice/configure.in
===================================================================
--- branches/marco/ports/vice/configure.in 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/configure.in 2008-06-01 03:24:13 UTC (rev 18818)
@@ -64,8 +64,8 @@
AC_ARG_WITH(oss, [ --without-oss do not use the OSS sound system])
AC_ARG_ENABLE(sdl, [ --with-sdl use sdl sound system])
AC_ARG_WITH(resid, [ --without-resid do not use the reSID engine])
-AC_ARG_WITH(png, [ --without-png do not use the PNG screenshot system])
-AC_ARG_WITH(zlib, [ --without-zlib do not use the ZLIB support])
+AC_ARG_WITH(png, [ --without-png do not use the PNG screenshot system])
+AC_ARG_WITH(zlib, [ --without-zlib do not use the ZLIB support])
AC_ARG_ENABLE(fullscreen, [ --enable-fullscreen enable XFree86 fullscreen detection], [ echo checking for XFree86 fullscreen requested...], [enable_fullscreen="no"; echo no explicit checking for XFree86 fullscreen requested, disabling fullscreen...])
AC_ARG_ENABLE(gnomeui,[ --enable-gnomeui enables gnome ui support])
AC_ARG_ENABLE(nls,[ --disable-nls disables national language support])
@@ -76,8 +76,13 @@
AC_ARG_ENABLE(parsid,[ --enable-parsid enables ParSID support])
AC_ARG_WITH(picasso96, [ --with-picasso96 use Amiga P96 grafix system instead of cgx])
AC_ARG_ENABLE(bundle, [ --disable-bundle do not use application bundles on Macs])
-AC_ARG_WITH(cocoa, [ --with-cocoa enables native Cocoa UI on Macs])
+AC_ARG_WITH(cocoa, [ --with-cocoa enables native Cocoa UI on Macs])
+AC_ARG_ENABLE(memmap, [ --enable-memmap enable the mem map feature])
+if test x"$enable_memmap" = "xyes"; then
+ AC_DEFINE(FEATURE_CPUMEMHISTORY,,[Use the memmap feature.])
+fi
+
if test x"$enable_gnomeui" = "xyes" ; then
AC_DEFINE(USE_GNOMEUI,,[Use GNOME UI.])
fi
Modified: branches/marco/ports/vice/src/6510core.c
===================================================================
--- branches/marco/ports/vice/src/6510core.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/6510core.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -1778,8 +1778,30 @@
#endif
#endif
+#ifdef FEATURE_CPUMEMHISTORY
+#ifndef DRIVE_CPU
+ memmap_state |= (MEMMAP_STATE_INSTR | MEMMAP_STATE_OPCODE);
+#endif
+#endif
+
FETCH_OPCODE(opcode);
+#ifdef FEATURE_CPUMEMHISTORY
+#ifndef DRIVE_CPU
+ /* HACK to cope with FETCH_OPCODE optimization in x64 */
+ if (((int)reg_pc) < bank_limit) {
+ memmap_mem_read(reg_pc);
+ }
+
+ if(p0 == 0x20) {
+ monitor_cpuhistory_store(reg_pc, (BYTE)(p0), (BYTE)(p1), (BYTE)(LOAD(reg_pc+2)));
+ } else {
+ monitor_cpuhistory_store(reg_pc, (BYTE)(p0), (BYTE)(p1), (BYTE)(p2 >> 8));
+ }
+ memmap_state &= ~(MEMMAP_STATE_INSTR | MEMMAP_STATE_OPCODE);
+#endif
+#endif
+
#ifdef DEBUG
#ifdef DRIVE_CPU
if (TRACEFLG) {
Modified: branches/marco/ports/vice/src/c64/c64mem.c
===================================================================
--- branches/marco/ports/vice/src/c64/c64mem.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/c64/c64mem.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -218,7 +218,12 @@
BYTE REGPARM1 zero_read(WORD addr)
{
addr &= 0xff;
-
+#ifdef FEATURE_CPUMEMHISTORY
+ if(!(memmap_state & MEMMAP_STATE_IGNORE)) {
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
+ memmap_state &= ~(MEMMAP_STATE_OPCODE);
+ }
+#endif
switch ((BYTE)addr) {
case 0:
return pport.dir_read;
@@ -242,7 +247,9 @@
void REGPARM2 zero_store(WORD addr, BYTE value)
{
addr &= 0xff;
-
+#ifdef FEATURE_CPUMEMHISTORY
+ monitor_memmap_store(addr, MEMMAP_RAM_W);
+#endif
switch ((BYTE)addr) {
case 0:
if (vbank == 0) {
Modified: branches/marco/ports/vice/src/gfxoutput.h
===================================================================
--- branches/marco/ports/vice/src/gfxoutput.h 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutput.h 2008-06-01 03:24:13 UTC (rev 18818)
@@ -27,6 +27,8 @@
#ifndef _GFXOUTPUT_H
#define _GFXOUTPUT_H
+#include "types.h"
+
struct screenshot_s;
typedef struct gfxoutputdrv_s {
@@ -38,6 +40,9 @@
int (*write)(struct screenshot_s *);
int (*save)(struct screenshot_s *, const char *);
int (*record)(struct screenshot_s *);
+#ifdef FEATURE_CPUMEMHISTORY
+ int (*savememmap)(const char *, int, int, BYTE *, BYTE *);
+#endif
} gfxoutputdrv_t;
/* Functions called by external emulator code. */
Modified: branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -348,6 +348,154 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *bmpdrv_memmap_fd;
+static char *bmpdrv_memmap_ext_filename;
+static BYTE *bmpdrv_memmap_bmp_data;
+
+static int bmpdrv_close_memmap(int x_size, int y_size)
+{
+ fwrite(bmpdrv_memmap_bmp_data, y_size * x_size, 1, bmpdrv_memmap_fd);
+ fclose(bmpdrv_memmap_fd);
+ lib_free(bmpdrv_memmap_ext_filename);
+ lib_free(bmpdrv_memmap_bmp_data);
+ return 0;
+}
+
+static DWORD bmpdrv_memmap_bmp_size(int x_size, int y_size)
+{
+ DWORD size = 0;
+
+ size = (DWORD)((14 + 40 + 4 * 256) + (x_size * y_size));
+
+ return size;
+}
+
+static int bmpdrv_memmap_write_bitmap_info(int x_size, int y_size, BYTE *palette)
+{
+ BYTE binfo[40];
+ BYTE *bcolor;
+ unsigned int i;
+
+ memset(binfo, 0, sizeof(binfo));
+
+ util_dword_to_le_buf(&binfo[0], sizeof(binfo));
+ util_dword_to_le_buf(&binfo[4], x_size);
+ util_dword_to_le_buf(&binfo[8], y_size);
+
+ binfo[12] = 1;
+ binfo[13] = 0;
+
+ binfo[14] = 8;
+ binfo[15] = 0;
+
+ util_dword_to_le_buf(&binfo[16], 0); /* BI_RGB */
+ util_dword_to_le_buf(&binfo[20], 0);
+
+ /* DPI in Pixels per Meter*/
+ util_dword_to_le_buf(&binfo[24], 0 * 10000 / 254);
+ util_dword_to_le_buf(&binfo[28], 0 * 10000 / 254);
+
+ util_dword_to_le_buf(&binfo[32], 256);
+ util_dword_to_le_buf(&binfo[36], 256);
+
+ if (fwrite(binfo, sizeof(binfo), 1, bmpdrv_memmap_fd) < 1)
+ return -1;
+
+ bcolor = (BYTE *)lib_malloc(256 * 4);
+
+ for (i = 0; i < 256; i++)
+ {
+ bcolor[i * 4] = palette[(i*3)+2];
+ bcolor[i * 4 + 1] = palette[(i*3)+1];
+ bcolor[i * 4 + 2] = palette[(i*3)];
+ bcolor[i * 4 + 3] = 0;
+ }
+
+ if (fwrite(bcolor, 256 * 4, 1, bmpdrv_memmap_fd) < 1)
+ {
+ lib_free(bcolor);
+ return -1;
+ }
+
+ lib_free(bcolor);
+ return 0;
+}
+
+static int bmpdrv_memmap_write_file_header(int x_size, int y_size)
+{
+ BYTE header[14];
+
+ memset(header, 0, sizeof(header));
+
+ header[0] = 'B';
+ header[1] = 'M';
+
+ util_dword_to_le_buf(&header[2], bmpdrv_memmap_bmp_size(x_size, y_size));
+
+ util_dword_to_le_buf(&header[10], (14 + 40 + 4 * 256));
+
+ if (fwrite(header, sizeof(header), 1, bmpdrv_memmap_fd) < 1)
+ return -1;
+
+ return 0;
+}
+
+static int bmpdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ bmpdrv_memmap_ext_filename = util_add_extension_const(filename, bmp_drv.default_extension);
+
+ bmpdrv_memmap_fd = fopen(bmpdrv_memmap_ext_filename, MODE_WRITE);
+
+ if (bmpdrv_memmap_fd == NULL)
+ {
+ lib_free(bmpdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (bmpdrv_memmap_write_file_header(x_size, y_size) < 0)
+ {
+ fclose(bmpdrv_memmap_fd);
+ lib_free(bmpdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (bmpdrv_memmap_write_bitmap_info(x_size, y_size, palette) < 0)
+ {
+ fclose(bmpdrv_memmap_fd);
+ lib_free(bmpdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ bmpdrv_memmap_bmp_data = (BYTE *)lib_malloc(x_size*y_size);
+
+ return 0;
+}
+
+static int bmpdrv_write_memmap(int line, int x_size, int y_size, BYTE *gfx)
+{
+ memcpy(bmpdrv_memmap_bmp_data + (y_size - 1 - line) * x_size, gfx+(line*x_size), x_size);
+}
+
+static int bmpdrv_memmap_save(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (bmpdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line=0; line<y_size; line++)
+ {
+ bmpdrv_write_memmap(line, x_size, y_size, gfx);
+ }
+
+ if (bmpdrv_close_memmap(x_size, y_size) < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t bmp_drv =
{
"BMP",
@@ -357,7 +505,12 @@
bmpdrv_close,
bmpdrv_write,
bmpdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ bmpdrv_memmap_save
+#else
NULL
+#endif
};
void gfxoutput_init_bmp(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/ffmpegdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -802,7 +802,12 @@
ffmpegdrv_close,
ffmpegdrv_write,
ffmpegdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ ffmpegdrv_record,
+ NULL
+#else
ffmpegdrv_record
+#endif
},
/*
{
@@ -836,7 +841,11 @@
ffmpegdrv_record
},
*/
- { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+ { NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+#endi
+ NULL }
};
void gfxoutput_init_ffmpeg(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/gifdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/gifdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/gifdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -161,6 +161,84 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static GifFileType *gifdrv_memmap_fd;
+static char *gifdrv_memmap_ext_filename;
+
+static int gifdrv_close_memmap(void)
+{
+ EGifCloseFile(gifdrv_memmap_fd);
+ FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int gifdrv_write_memmap(int line, int x_size, BYTE *gfx)
+{
+ if (EGifPutLine(gifdrv_memmap_fd, gfx+(line*x_size), x_size)==GIF_ERROR)
+ return -1;
+
+ return 0;
+}
+
+static int gifdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ unsigned int i;
+ GifColorType ColorMap256[256];
+
+ gifdrv_memmap_ext_filename=util_add_extension_const(filename, gif_drv.default_extension);
+
+ gifdrv_memmap_fd=EGifOpenFileName(gifdrv_memmap_ext_filename, FALSE);
+
+ if (gifdrv_memmap_fd==NULL)
+ {
+ lib_free(gifdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ gif_colors=MakeMapObject(256, ColorMap256);
+
+ for (i = 0; i < 256; i++)
+ {
+ gif_colors->Colors[i].Blue=palette[(i*3)+2];
+ gif_colors->Colors[i].Green=palette[(i*3)+1];
+ gif_colors->Colors[i].Red=palette[i*3];
+ }
+
+ EGifSetGifVersion("87a");
+
+ if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
+ EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, FALSE, NULL) == GIF_ERROR)
+ {
+ EGifCloseFile(gifdrv_memmap_fd);
+ FreeMapObject(gif_colors);
+ lib_free(gifdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int gifdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (gifdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ gifdrv_write_memmap(line, x_size, gfx);
+ }
+
+ if (gifdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t gif_drv =
{
"GIF",
@@ -170,7 +248,12 @@
gifdrv_close,
gifdrv_write,
gifdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ gifdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_gif(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/iffdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/iffdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/iffdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -225,6 +225,136 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *iffdrv_memmap_fd;
+static char *iffdrv_memmap_ext_filename;
+static BYTE *iffdrv_memmap_iff_data;
+static int iffdrv_memmap_iff_rowbytes;
+
+static int iffdrv_close_memmap(void)
+{
+ fclose(iffdrv_memmap_fd);
+ lib_free(iffdrv_memmap_iff_data);
+ lib_free(iffdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int iffdrv_write_memmap(int line, int x_size, BYTE *gfx)
+{
+ int j;
+
+ for (j = 0; j<8; j++)
+ {
+ iff_c2p(gfx+(x_size*line), iffdrv_memmap_iff_data, iffdrv_memmap_iff_rowbytes, j);
+ if (fwrite(iffdrv_memmap_iff_data, iffdrv_memmap_iff_rowbytes, 1, iffdrv_memmap_fd)<1)
+ return -1;
+ }
+ return 0;
+}
+
+static int iffdrv_write_file_header_memmap(int x_size, int y_size, BYTE *palette)
+{
+ BYTE header[836];
+ int i;
+ int totalsize;
+
+ memset(header, 0, sizeof(header));
+
+ iffdrv_memmap_iff_rowbytes=((x_size+15)>>4)<<1;
+
+ totalsize=828+(iffdrv_memmap_iff_rowbytes*y_size*8);
+
+ header[0]='F';
+ header[1]='O';
+ header[2]='R';
+ header[3]='M';
+ util_dword_to_be_buf(&header[4], totalsize);
+ header[8]='I';
+ header[9]='L';
+ header[10]='B';
+ header[11]='M';
+ header[12]='B';
+ header[13]='M';
+ header[14]='H';
+ header[15]='D';
+ util_dword_to_be_buf(&header[16], 20);
+ util_word_to_be_buf(&header[20],(WORD)(x_size));
+ util_word_to_be_buf(&header[22],(WORD)(y_size));
+ header[28]=8;
+ util_word_to_be_buf(&header[36],(WORD)(x_size));
+ util_word_to_be_buf(&header[38],(WORD)(y_size));
+ header[40]='C';
+ header[41]='M';
+ header[42]='A';
+ header[43]='P';
+ util_dword_to_be_buf(&header[44],3*256);
+
+ for (i = 0; i < 256; i++)
+ {
+ header[48+(i*3)]=palette[i*3];
+ header[49+(i*3)]=palette[(i*3)+1];
+ header[50+(i*3)]=palette[(i*3)+2];
+ }
+ header[816]='C';
+ header[817]='A';
+ header[818]='M';
+ header[819]='G';
+ util_dword_to_be_buf(&header[820],4);
+ header[828]='B';
+ header[829]='O';
+ header[830]='D';
+ header[831]='Y';
+ util_dword_to_be_buf(&header[832],iffdrv_memmap_iff_rowbytes*y_size*8);
+
+ if (fwrite(header,836,1,iffdrv_memmap_fd)<1)
+ return -1;
+
+ return 0;
+}
+
+static int iffdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ iffdrv_memmap_ext_filename=util_add_extension_const(filename, iff_drv.default_extension);
+ iffdrv_memmap_fd = fopen(iffdrv_memmap_ext_filename, "wb");
+
+ if (iffdrv_memmap_fd==NULL)
+ {
+ lib_free(iffdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (iffdrv_write_file_header_memmap(x_size, y_size, palette)<0)
+ {
+ fclose(iffdrv_memmap_fd);
+ lib_free(iffdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ iffdrv_memmap_iff_data = (BYTE *)lib_malloc(iffdrv_memmap_iff_rowbytes);
+
+ return 0;
+}
+
+static int iffdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (iffdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ iffdrv_write_memmap(line, x_size, gfx);
+ }
+
+ if (iffdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t iff_drv =
{
"IFF",
@@ -234,7 +364,12 @@
iffdrv_close,
iffdrv_write,
iffdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ iffdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_iff(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/jpegdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/jpegdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/jpegdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -135,6 +135,84 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *jpegdrv_memmap_fd;
+static char *jpegdrv_memmap_ext_filename;
+static BYTE *jpegdrv_memmap_data;
+
+static int jpegdrv_close_memmap(void)
+{
+ jpeg_finish_compress(&cinfo);
+ fclose(jpegdrv_memmap_fd);
+ jpeg_destroy_compress(&cinfo);
+ lib_free(jpegdrv_memmap_data);
+ lib_free(jpegdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int jpegdrv_write_memmap(int line, int x_size, BYTE *gfx, BYTE *palette)
+{
+ int i;
+ BYTE pixval;
+ JSAMPROW rowpointer[1];
+
+ for (i=0; i<x_size; i++)
+ {
+ pixval = gfx[(line*x_size)+i];
+ jpegdrv_memmap_data[i*3]=palette[pixval*3];
+ jpegdrv_memmap_data[(i*3)+1]=palette[(pixval*3)+1];
+ jpegdrv_memmap_data[(i*3)+2]=palette[(pixval*3)+2];
+ }
+ rowpointer[0]=jpegdrv_memmap_data;
+ jpeg_write_scanlines(&cinfo, rowpointer, 1);
+
+ return 0;
+}
+
+static int jpegdrv_open_memmap(const char *filename, int x_size, int y_size)
+{
+ cinfo.err = jpeg_std_error(&jerr);
+ jpeg_create_compress(&cinfo);
+ jpegdrv_memmap_ext_filename=util_add_extension_const(filename, jpeg_drv.default_extension);
+ jpegdrv_memmap_fd = fopen(jpegdrv_memmap_ext_filename, "wb");
+ if (jpegdrv_memmap_fd==NULL)
+ {
+ jpeg_destroy_compress(&cinfo);
+ lib_free(jpegdrv_memmap_ext_filename);
+ return -1;
+ }
+ jpeg_stdio_dest(&cinfo, jpegdrv_memmap_fd);
+ jpegdrv_memmap_data = (BYTE *)lib_malloc(x_size*3);
+ cinfo.image_width = x_size;
+ cinfo.image_height = y_size;
+ cinfo.input_components = 3;
+ cinfo.in_color_space = JCS_RGB;
+ jpeg_set_defaults(&cinfo);
+ jpeg_start_compress(&cinfo, TRUE);
+
+ return 0;
+}
+
+static int jpegdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (jpegdrv_open_memmap(filename, x_size, y_size) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ jpegdrv_write_memmap(line, x_size, gfx, palette);
+ }
+
+ if (jpegdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t jpeg_drv =
{
"JPEG",
@@ -144,7 +222,12 @@
jpegdrv_close,
jpegdrv_write,
jpegdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ jpegdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_jpeg(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/pcxdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/pcxdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/pcxdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -256,6 +256,180 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *pcxdrv_memmap_fd;
+static char *pcxdrv_memmap_ext_filename;
+static BYTE *pcxdrv_memmap_pcx_data;
+
+static int pcxdrv_close_memmap(BYTE *palette)
+{
+ BYTE pcx_color_prefix[2]="\x0c";
+
+ fwrite(pcx_color_prefix, 1, 1, pcxdrv_memmap_fd);
+
+ fwrite(palette, 3*256, 1, pcxdrv_memmap_fd);
+
+ fclose(pcxdrv_memmap_fd);
+ lib_free(pcxdrv_memmap_pcx_data);
+ lib_free(pcxdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int pcxdrv_write_memmap(int line, int x_size, BYTE *gfx)
+{
+ BYTE color,amount;
+ unsigned int i,j=0;
+
+ color=gfx[(line*x_size)];
+ amount=1;
+ for (i = 1; i<x_size; i++)
+ {
+ if (gfx[(line*x_size)+i]==color)
+ {
+ amount=amount+1;
+ if (amount==63)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xff;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ amount=0;
+ }
+ }
+ else
+ {
+ if (amount==0)
+ {
+ color=gfx[(line*x_size)+i];
+ amount=1;
+ }
+ else
+ {
+ if (amount>1)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc0 | amount;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ color=gfx[(line*x_size)+i];
+ amount=1;
+ }
+ else
+ {
+ if (color>0xbf)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc1;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ }
+ else
+ {
+ pcxdrv_memmap_pcx_data[j]=color;
+ j++;
+ }
+ color=gfx[(line*x_size)+i];
+ amount=1;
+ }
+ }
+ }
+ }
+ if (amount==1)
+ {
+ if (color>0xbf)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc1;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ }
+ else
+ {
+ pcxdrv_memmap_pcx_data[j]=color;
+ j++;
+ }
+ }
+ else
+ {
+ if (amount>1)
+ {
+ pcxdrv_memmap_pcx_data[j]=0xc0 | amount;
+ pcxdrv_memmap_pcx_data[j+1]=color;
+ j=j+2;
+ }
+ }
+
+ if (fwrite(pcxdrv_memmap_pcx_data, j, 1, pcxdrv_memmap_fd)<1)
+ return -1;
+
+ return 0;
+}
+
+static int pcxdrv_write_file_header_memmap(int x_size, int y_size)
+{
+ BYTE header[128];
+
+ memset(header, 0, sizeof(header));
+
+ header[0]=0xa;
+ header[1]=5;
+ header[2]=1;
+ header[3]=8;
+
+ util_word_to_le_buf(&header[8], (WORD)(x_size-1));
+ util_word_to_le_buf(&header[10], (WORD)(y_size-1));
+
+ util_word_to_le_buf(&header[12], (WORD)(0));
+ util_word_to_le_buf(&header[14], (WORD)(0));
+
+ header[65]=1;
+ util_word_to_le_buf(&header[66], (WORD)(x_size));
+
+ if (fwrite(header, sizeof(header), 1, pcxdrv_memmap_fd)<1)
+ return -1;
+
+ return 0;
+}
+
+static int pcxdrv_open_memmap(const char *filename, int x_size, int y_size)
+{
+ pcxdrv_memmap_ext_filename=util_add_extension_const(filename, pcx_drv.default_extension);
+ pcxdrv_memmap_fd = fopen(pcxdrv_memmap_ext_filename, "wb");
+
+ if (pcxdrv_memmap_fd==NULL)
+ {
+ lib_free(pcxdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (pcxdrv_write_file_header_memmap(x_size, y_size)<0)
+ {
+ fclose(pcxdrv_memmap_fd);
+ lib_free(pcxdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ pcxdrv_memmap_pcx_data = (BYTE *)lib_malloc(x_size*2);
+
+ return 0;
+}
+
+static int pcxdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (pcxdrv_open_memmap(filename, x_size, y_size) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ pcxdrv_write_memmap(line, x_size, gfx);
+ }
+
+ if (pcxdrv_close_memmap(palette) < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t pcx_drv =
{
"PCX",
@@ -265,7 +439,12 @@
pcxdrv_close,
pcxdrv_write,
pcxdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ pcxdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_pcx(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/pngdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/pngdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/pngdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -161,6 +161,114 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *pngdrv_memmap_fd;
+static char *pngdrv_memmap_ext_filename;
+static png_structp pngdrv_memmap_png_ptr;
+static png_infop pngdrv_memmap_info_ptr;
+static BYTE *pngdrv_memmap_png_data;
+
+static int pngdrv_close_memmap(void)
+{
+ png_write_end(pngdrv_memmap_png_ptr, pngdrv_memmap_info_ptr);
+
+ png_destroy_write_struct(&(pngdrv_memmap_png_ptr), &(pngdrv_memmap_info_ptr));
+
+ fclose(pngdrv_memmap_fd);
+ lib_free(pngdrv_memmap_png_data);
+ lib_free(pngdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int pngdrv_write_memmap(int line, int x_size, BYTE *gfx, BYTE *palette)
+{
+ int i;
+ BYTE pixval;
+
+ for (i=0; i<x_size; i++)
+ {
+ pixval = gfx[(line*x_size)+i];
+ pngdrv_memmap_png_data[i*4] = palette[pixval*3];
+ pngdrv_memmap_png_data[(i*4)+1] = palette[(pixval*3)+1];
+ pngdrv_memmap_png_data[(i*4)+2] = palette[(pixval*3)+2];
+ pngdrv_memmap_png_data[(i*4)+3] = 0;
+ }
+
+ png_write_row(pngdrv_memmap_png_ptr, (png_bytep)(pngdrv_memmap_png_data));
+
+ return 0;
+}
+
+static int pngdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE *palette)
+{
+ pngdrv_memmap_png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, (void *)NULL, NULL, NULL);
+
+ if (pngdrv_memmap_png_ptr == NULL)
+ return -1;
+
+ pngdrv_memmap_info_ptr = png_create_info_struct(pngdrv_memmap_png_ptr);
+
+ if (pngdrv_memmap_info_ptr == NULL)
+ {
+ png_destroy_write_struct(&(pngdrv_memmap_png_ptr), (png_infopp)NULL);
+ return -1;
+ }
+
+ if (setjmp(pngdrv_memmap_png_ptr->jmpbuf))
+ {
+ png_destroy_write_struct(&(pngdrv_memmap_png_ptr), &(pngdrv_memmap_info_ptr));
+ return -1;
+ }
+
+ pngdrv_memmap_ext_filename = util_add_extension_const(filename, png_drv.default_extension);
+
+ pngdrv_memmap_fd = fopen(pngdrv_memmap_ext_filename, MODE_WRITE);
+
+ if (pngdrv_memmap_fd == NULL)
+ {
+ lib_free(pngdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ pngdrv_memmap_png_data = (BYTE *)lib_malloc(x_size * 4);
+
+ png_init_io(pngdrv_memmap_png_ptr, pngdrv_memmap_fd);
+ png_set_compression_level(pngdrv_memmap_png_ptr, Z_BEST_COMPRESSION);
+
+ pngdrv_memmap_info_ptr->width = x_size;
+ pngdrv_memmap_info_ptr->height= y_size;
+ pngdrv_memmap_info_ptr->bit_depth = 8;
+ pngdrv_memmap_info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+
+ png_write_info(pngdrv_memmap_png_ptr, pngdrv_memmap_info_ptr);
+
+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
+ png_set_invert_alpha(pngdrv_memmap_png_ptr);
+#endif
+
+ return 0;
+}
+
+static int pngdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (pngdrv_open_memmap(filename, x_size, y_size, palette) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ pngdrv_write_memmap(line, x_size, gfx, palette);
+ }
+
+ if (pngdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t png_drv =
{
"PNG",
@@ -170,7 +278,12 @@
pngdrv_close,
pngdrv_write,
pngdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ pngdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_png(void)
Modified: branches/marco/ports/vice/src/gfxoutputdrv/ppmdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/ppmdrv.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/gfxoutputdrv/ppmdrv.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -151,6 +151,86 @@
return 0;
}
+#ifdef FEATURE_CPUMEMHISTORY
+static FILE *ppmdrv_memmap_fd;
+static char *ppmdrv_memmap_ext_filename;
+
+static int ppmdrv_close_memmap(void)
+{
+ fclose(ppmdrv_memmap_fd);
+ lib_free(ppmdrv_memmap_ext_filename);
+
+ return 0;
+}
+
+static int ppmdrv_write_memmap(int line, int x_size, BYTE *gfx, BYTE *palette)
+{
+ unsigned int i;
+ BYTE pixval;
+
+ for (i = 0; i<x_size; i++)
+ {
+ pixval = gfx[(line*x_size)+i];
+ if (fprintf(ppmdrv_memmap_fd, "%3d %3d %3d\x0a",palette[pixval*3],palette[(pixval*3)+1],palette[(pixval*3)+2])<0)
+ return -1;
+ }
+ return 0;
+}
+
+static int ppmdrv_write_file_header_memmap(int x_size, int y_size)
+{
+ if (fprintf(ppmdrv_memmap_fd,"P3\x0a")<0)
+ return -1;
+ if (fprintf(ppmdrv_memmap_fd,"# VICEplus generated PPM mem map grafix\x0a")<0)
+ return -1;
+ if (fprintf(ppmdrv_memmap_fd,"%d %d\x0a",x_size,y_size)<0)
+ return -1;
+ if (fprintf(ppmdrv_memmap_fd,"255\x0a")<0)
+ return -1;
+
+ return 0;
+}
+
+static int ppmdrv_open_memmap(const char *filename, int x_size, int y_size)
+{
+ ppmdrv_memmap_ext_filename=util_add_extension_const(filename, ppm_drv.default_extension);
+ ppmdrv_memmap_fd = fopen(ppmdrv_memmap_ext_filename, "wb");
+
+ if (ppmdrv_memmap_fd==NULL)
+ {
+ lib_free(ppmdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ if (ppmdrv_write_file_header_memmap(x_size, y_size)<0)
+ {
+ fclose(ppmdrv_memmap_fd);
+ lib_free(ppmdrv_memmap_ext_filename);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int ppmdrv_save_memmap(const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
+{
+ int line;
+
+ if (ppmdrv_open_memmap(filename, x_size, y_size) < 0)
+ return -1;
+
+ for (line = 0; line < y_size; line++)
+ {
+ ppmdrv_write_memmap(line, x_size, gfx, palette);
+ }
+
+ if (ppmdrv_close_memmap() < 0)
+ return -1;
+
+ return 0;
+}
+#endif
+
static gfxoutputdrv_t ppm_drv =
{
"PPM",
@@ -160,7 +240,12 @@
ppmdrv_close,
ppmdrv_write,
ppmdrv_save,
+#ifdef FEATURE_CPUMEMHISTORY
+ NULL,
+ ppmdrv_save_memmap
+#else
NULL
+#endif
};
void gfxoutput_init_ppm(void)
Modified: branches/marco/ports/vice/src/maincpu.c
===================================================================
--- branches/marco/ports/vice/src/maincpu.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/maincpu.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -74,24 +74,76 @@
/* ------------------------------------------------------------------------- */
+#ifndef STORE_ZERO
+#define STORE_ZERO(addr, value) \
+ zero_store((WORD)(addr), (BYTE)(value))
+#endif
+
+#ifndef LOAD_ZERO
+#define LOAD_ZERO(addr) \
+ zero_read((WORD)(addr))
+#endif
+
+#ifdef FEATURE_CPUMEMHISTORY
+
+/* HACK this is C64 specific */
+
+void REGPARM2 memmap_mem_store(WORD addr, BYTE value)
+{
+ if((addr >= 0xd000)&&(addr <= 0xdfff)) {
+ monitor_memmap_store(addr, MEMMAP_I_O_W);
+ } else {
+ monitor_memmap_store(addr, MEMMAP_RAM_W);
+ }
+ (*_mem_write_tab_ptr[(addr) >> 8])((WORD)(addr), (BYTE)(value));
+}
+
+BYTE REGPARM1 memmap_mem_read(WORD addr)
+{
+ switch(addr >> 12) {
+ case 0xa:
+ case 0xb:
+ case 0xe:
+ case 0xf:
+ memmap_state |= MEMMAP_STATE_IGNORE;
+ if(LOAD_ZERO(1) & (1 << ((addr>>14) & 1))) {
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_ROM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_ROM_R);
+ } else {
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
+ }
+ memmap_state &= ~(MEMMAP_STATE_IGNORE);
+ break;
+ case 0xd:
+ monitor_memmap_store(addr, MEMMAP_I_O_R);
+ break;
+ default:
+ monitor_memmap_store(addr, (memmap_state&MEMMAP_STATE_OPCODE)?MEMMAP_RAM_X:(memmap_state&MEMMAP_STATE_INSTR)?0:MEMMAP_RAM_R);
+ break;
+ }
+ memmap_state &= ~(MEMMAP_STATE_OPCODE);
+ return (*_mem_read_tab_ptr[(addr) >> 8])((WORD)(addr));
+}
+
#ifndef STORE
#define STORE(addr, value) \
- (*_mem_write_tab_ptr[(addr) >> 8])((WORD)(addr), (BYTE)(value))
+ memmap_mem_store(addr, value)
#endif
#ifndef LOAD
#define LOAD(addr) \
- (*_mem_read_tab_ptr[(addr) >> 8])((WORD)(addr))
+ memmap_mem_read(addr)
#endif
-#ifndef STORE_ZERO
-#define STORE_ZERO(addr, value) \
- zero_store((WORD)(addr), (BYTE)(value))
+#endif /* FEATURE_CPUMEMHISTORY */
+
+#ifndef STORE
+#define STORE(addr, value) \
+ (*_mem_write_tab_ptr[(addr) >> 8])((WORD)(addr), (BYTE)(value))
#endif
-#ifndef LOAD_ZERO
-#define LOAD_ZERO(addr) \
- zero_read((WORD)(addr))
+#ifndef LOAD
+#define LOAD(addr) \
+ (*_mem_read_tab_ptr[(addr) >> 8])((WORD)(addr))
#endif
#define LOAD_ADDR(addr) \
Modified: branches/marco/ports/vice/src/monitor/mon_command.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_command.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/monitor/mon_command.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -67,6 +67,10 @@
"<type>",
"Specify the type of CPU currently used (6502/z80)." },
+ { "cpuhistory", "chis",
+ "[<count>]",
+ "Show <count> last executed commands." },
+
{ "dump", "",
"\"<filename>\"",
"Write a snapshot of the machine into the file specified.\n"
@@ -221,6 +225,22 @@
"is specified, only one character is displayed. If no addresses are\n"
"given, the ``dot'' address is used." },
+ { "memmapsave", "mmsave",
+ "\"<filename>\" <format>",
+ "Save the memmap as a picture. Format is:\n"
+ "0 = BMP, 1 = PCX, 2 = PNG, 3 = GIF, 4 = IFF." },
+
+ { "memmapshow", "mmsh",
+ "[<mask>] [<address_opt_range>]",
+ "Show the memmap. The mask can be specified to show only those\n"
+ "locations with accesses of certain type(s). The mask is a number\n"
+ "with the bits \"ioRWXrwx\", where RWX are for ROM and rwx for RAM.\n"
+ "Optionally, an address range can be specified." },
+
+ { "memmapzap", "mmzap",
+ NULL,
+ "Clear the memmap." },
+
{ "memsprite", "ms",
"[<data_type>] [<address_opt_range>]",
"Display the contents of memory as sprite data. If only one address is\n"
Modified: branches/marco/ports/vice/src/monitor/mon_lex.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_lex.c 2008-05-31 20:59:20 UTC (rev 18817)
+++ branches/marco/ports/vice/src/monitor/mon_lex.c 2008-06-01 03:24:13 UTC (rev 18818)
@@ -363,8 +363,8 @@
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 169
-#define YY_END_OF_BUFFER 170
+#define YY_NUM_RULES 173
+#define YY_END_OF_BUFFER 174
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -372,116 +372,119 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_acclist[955] =
+static yyconst flex_int16_t yy_acclist[987] =
{ 0,
- 96, 159, 96, 159, 96, 96, 96, 96, 81, 96,
- 81, 96, 96, 96, 96, 159, 96, 159, 96, 159,
- 96, 159, 96, 159, 96, 159, 96, 159, 96, 159,
- 96, 99, 96, 99, 95, 96, 95, 96, 170, 168,
- 169, 96, 169, 97, 168, 169, 79, 168, 169, 168,
- 169, 168, 169, 168, 169, 168, 169, 166, 168, 169,
- 168, 169, 159, 161, 164, 168, 169, 156, 159, 161,
- 164, 168, 169, 161, 164, 168, 169, 161, 164, 168,
- 169, 72, 168, 169, 165, 168, 169, 164, 168, 169,
- 88, 164, 168, 169, 164, 168, 169, 86, 164, 168,
+ 100, 163, 100, 163, 100, 100, 100, 100, 85, 100,
+ 85, 100, 100, 100, 100, 163, 100, 163, 100, 163,
+ 100, 163, 100, 163, 100, 163, 100, 163, 100, 163,
+ 100, 103, 100, 103, 99, 100, 99, 100, 174, 172,
+ 173, 100, 173, 101, 172, 173, 83, 172, 173, 172,
+ 173, 172, 173, 172, 173, 172, 173, 170, 172, 173,
+ 172, 173, 163, 165, 168, 172, 173, 160, 163, 165,
+ 168, 172, 173, 165, 168, 172, 173, 165, 168, 172,
+ 173, 76, 172, 173, 169, 172, 173, 168, 172, 173,
+ 92, 168, 172, 173, 168, 172, 173, 90, 168, 172,
- 169, 87, 168, 169, 89, 168, 169, 168, 169, 168,
- 169, 168, 169, 89, 168, 169, 168, 169, 168, 169,
- 168, 169, 168, 169, 2, 168, 169, 32, 168, 169,
- 3, 168, 169, 71, 168, 169, 4, 71, 168, 169,
- 71, 168, 169, 17, 71, 168, 169, 21, 71, 168,
- 169, 71, 168, 169, 30, 71, 168, 169, 31, 71,
- 168, 169, 33, 71, 168, 169, 34, 71, 168, 169,
- 71, 168, 169, 39, 71, 168, 169, 41, 71, 168,
- 169, 45, 71, 168, 169, 47, 71, 168, 169, 71,
- 168, 169, 52, 71, 168, 169, 57, 71, 168, 169,
+ 173, 91, 172, 173, 93, 172, 173, 172, 173, 172,
+ 173, 172, 173, 93, 172, 173, 172, 173, 172, 173,
+ 172, 173, 172, 173, 2, 172, 173, 33, 172, 173,
+ 3, 172, 173, 75, 172, 173, 4, 75, 172, 173,
+ 75, 172, 173, 17, 75, 172, 173, 22, 75, 172,
+ 173, 75, 172, 173, 31, 75, 172, 173, 32, 75,
+ 172, 173, 34, 75, 172, 173, 35, 75, 172, 173,
+ 75, 172, 173, 40, 75, 172, 173, 42, 75, 172,
+ 173, 49, 75, 172, 173, 51, 75, 172, 173, 75,
+ 172, 173, 56, 75, 172, 173, 61, 75, 172, 173,
- 43, 71, 168, 169, 71, 168, 169, 69, 71, 168,
- 169, 29, 71, 168, 169, 71, 168, 169, 63, 71,
- 168, 169, 1, 168, 169, 81, 168, 169, 81, 96,
- 169, 80, 168, 169, 81, 166, 168, 169, 81, 165,
- 168, 169, 100, 168, 169, 100, 166, 168, 169, 100,
- 165, 168, 169, 153, 168, 169, 151, 168, 169, 152,
- 168, 169, 168, 169, 156, 159, 161, 164, 168, 169,
- 161, 164, 168, 169, 154, 168, 169, 164, 168, 169,
- 16526, 143, 164, 168, 169, 144, 164, 168, 169, 145,
- 164, 168, 169, 146, 164, 168, 169, 164, 168, 169,
+ 47, 75, 172, 173, 75, 172, 173, 73, 75, 172,
+ 173, 30, 75, 172, 173, 75, 172, 173, 67, 75,
+ 172, 173, 1, 172, 173, 85, 172, 173, 85, 100,
+ 173, 84, 172, 173, 85, 170, 172, 173, 85, 169,
+ 172, 173, 104, 172, 173, 104, 170, 172, 173, 104,
+ 169, 172, 173, 157, 172, 173, 155, 172, 173, 156,
+ 172, 173, 172, 173, 160, 163, 165, 168, 172, 173,
+ 165, 168, 172, 173, 158, 172, 173, 168, 172, 173,
+ 16530, 147, 168, 172, 173, 148, 168, 172, 173, 149,
+ 168, 172, 173, 150, 168, 172, 173, 168, 172, 173,
- 168, 169, 147, 168, 169, 168, 169, 148, 168, 169,
- 149, 168, 169, 150, 168, 169, 164, 168, 169,16526,
- 143, 164, 168, 169, 145, 164, 168, 169, 147, 168,
- 169, 168, 169, 149, 168, 169, 168, 169, 168, 169,
- 119, 168, 169, 120, 168, 169, 168, 169, 109, 168,
- 169, 165, 168, 169, 110, 168, 169, 168, 169, 101,
- 164, 168, 169, 168, 169, 168, 169, 102, 168, 169,
- 103, 168, 169, 102, 168, 169, 168, 169, 99, 168,
- 169, 99, 168, 169, 99, 168, 169, 99, 168, 169,
- 99, 168, 169, 95, 168, 169, 96, 163, 157, 158,
+ 172, 173, 151, 172, 173, 172, 173, 152, 172, 173,
+ 153, 172, 173, 154, 172, 173, 168, 172, 173,16530,
+ 147, 168, 172, 173, 149, 168, 172, 173, 151, 172,
+ 173, 172, 173, 153, 172, 173, 172, 173, 172, 173,
+ 123, 172, 173, 124, 172, 173, 172, 173, 113, 172,
+ 173, 169, 172, 173, 114, 172, 173, 172, 173, 105,
+ 168, 172, 173, 172, 173, 172, 173, 106, 172, 173,
+ 107, 172, 173, 106, 172, 173, 172, 173, 103, 172,
+ 173, 103, 172, 173, 103, 172, 173, 103, 172, 173,
+ 103, 172, 173, 99, 172, 173, 100, 167, 161, 162,
- 160, 82, 84, 85, 83, 141, 140, 141, 159, 161,
- 164, 161, 164, 164, 156, 159, 161, 164, 156, 159,
- 161, 164, 91, 92, 90, 162, 78, 73, 71, 71,
- 5, 71, 71, 71, 8, 71, 9, 71, 11, 71,
- 12, 71, 13, 71, 71, 15, 71, 71, 71, 71,
- 71, 23, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 35, 71, 37, 71, 71, 40, 71, 71, 20,
- 71, 42, 71, 71, 71, 44, 71, 71, 46, 71,
- 71, 71, 71, 71, 71, 71, 71, 59, 71, 71,
- 71, 71, 58, 71, 71, 71, 66, 71, 67, 71,
+ 164, 86, 88, 89, 87, 145, 144, 145, 163, 165,
+ 168, 165, 168, 168, 160, 163, 165, 168, 160, 163,
+ 165, 168, 95, 96, 94, 166, 82, 77, 75, 75,
+ 5, 75, 75, 75, 8, 75, 9, 75, 11, 75,
+ 12, 75, 13, 75, 75, 15, 75, 75, 75, 75,
+ 75, 75, 24, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 36, 75, 38, 75, 75, 41, 75, 75,
+ 21, 75, 43, 75, 75, 75, 75, 48, 75, 75,
+ 50, 75, 75, 75, 75, 75, 75, 75, 75, 63,
+ 75, 75, 75, 75, 62, 75, 75, 75, 70, 75,
- 71, 71, 81, 81, 96, 100, 156, 159, 161, 164,
- 8334, 139, 164, 129, 139, 164, 139, 130, 139, 164,
- 131, 139, 164, 132, 139, 133, 139, 136, 139, 139,
- 162, 133, 139, 136, 139, 107, 112, 114, 115, 116,
- 108, 106, 111, 113, 104, 105, 167, 99, 99, 99,
- 95, 141, 140, 141, 159, 161, 164, 161, 164, 164,
- 156, 159, 161, 164, 93, 94, 74, 98, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 19, 71,
- 22, 71, 71, 24, 71, 71, 71, 71, 71, 71,
- 71, 71, 71, 71, 71, 71, 41, 71, 71, 71,
+ 71, 75, 75, 75, 85, 85, 100, 104, 160, 163,
+ 165, 168, 8338, 143, 168, 133, 143, 168, 143, 134,
+ 143, 168, 135, 143, 168, 136, 143, 137, 143, 140,
+ 143, 143, 166, 137, 143, 140, 143, 111, 116, 118,
+ 119, 120, 112, 110, 115, 117, 108, 109, 171, 103,
+ 103, 103, 99, 145, 144, 145, 163, 165, 168, 165,
+ 168, 168, 160, 163, 165, 168, 97, 98, 78, 102,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 19, 75, 23, 75, 75, 25, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 42,
- 71, 71, 48, 71, 71, 50, 71, 51, 71, 71,
- 71, 56, 71, 71, 71, 62, 71, 61, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 139,
- 164, 139, 134, 139, 135, 139, 137, 139, 138, 139,
- 117, 118, 159, 161, 164, 161, 164, 164, 156, 159,
- 161, 164, 76, 71, 71, 71, 7, 71, 71, 71,
- 71, 71, 71, 71, 71, 18, 71, 71, 71, 71,
- 71, 27, 71, 71, 29, 71, 30, 71, 31, 71,
- 32, 71, 33, 71, 71, 71, 39, 71, 71, 71,
- 43, 71, 45, 71, 71, 71, 49, 71, 71, 71,
+ 75, 75, 75, 75, 75, 75, 75, 52, 75, 75,
+ 54, 75, 55, 75, 75, 75, 60, 75, 75, 75,
+ 66, 75, 65, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 143, 168, 143, 138, 143, 139,
+ 143, 141, 143, 142, 143, 121, 122, 163, 165, 168,
+ 165, 168, 168, 160, 163, 165, 168, 80, 75, 75,
+ 75, 7, 75, 75, 75, 75, 75, 75, 20, 75,
+ 75, 75, 18, 75, 75, 75, 75, 75, 75, 28,
+ 75, 75, 30, 75, 31, 75, 32, 75, 33, 75,
+ 34, 75, 75, 75, 40, 75, 75, 75, 75, 75,
- 71, 71, 71, 71, 71, 71, 57, 71, 71, 71,
- 71, 71, 63, 71, 64, 71, 71, 71, 71, 71,
- 71, 71, 139, 164, 139, 159, 161, 164, 161, 164,
- 164, 156, 159, 161, 164, 77, 71, 71, 71, 8,
- 71, 71, 10, 71, 11, 71, 71, 71, 71, 71,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 47, 71, 50, 71, 71, 71, 53, 71,
- 71, 71, 71, 71, 71, 71, 60, 71, 71, 71,
- 71, 66, 71, 71, 67, 71, 69, 71, 71, 125,
- 159, 161, 164, 161, 164, 164, 156, 159, 161, 164,
+ 45, 75, 75, 47, 75, 49, 75, 75, 75, 53,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 61,
+ 75, 75, 75, 75, 75, 67, 75, 68, 75, 75,
+ 75, 75, 75, 75, 75, 143, 168, 143, 163, 165,
+ 168, 165, 168, 168, 160, 163, 165, 168, 81, 75,
+ 75, 75, 8, 75, 75, 10, 75, 11, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 46, 75, 75,
+ 51, 75, 54, 75, 75, 75, 57, 75, 75, 75,
+ 75, 75, 75, 75, 64, 75, 75, 75, 75, 70,
- 75, 71, 6, 71, 71, 71, 71, 71, 71, 71,
- 22, 71, 25, 71, 24, 71, 71, 21, 71, 28,
- 71, 36, 71, 38, 71, 71, 71, 71, 71, 51,
- 71, 71, 54, 71, 71, 55, 71, 56, 71, 71,
- 59, 71, 71, 71, 68, 71, 71, 121, 128, 126,
- 159, 161, 164, 161, 164, 164, 156, 159, 161, 164,
- 71, 71, 71, 71, 71, 16, 71, 17, 71, 71,
- 71, 26, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 70, 71, 127, 155, 159, 161, 164, 155,
- 161, 164, 155, 164, 155, 156, 159, 161, 164, 71,
+ 75, 75, 71, 75, 73, 75, 75, 129, 163, 165,
+ 168, 165, 168, 168, 160, 163, 165, 168, 79, 75,
+ 6, 75, 75, 75, 75, 75, 75, 75, 75, 23,
+ 75, 26, 75, 25, 75, 75, 22, 75, 29, 75,
+ 37, 75, 39, 75, 75, 75, 75, 75, 44, 75,
+ 75, 55, 75, 75, 58, 75, 75, 59, 75, 60,
+ 75, 75, 63, 75, 75, 75, 72, 75, 75, 125,
+ 132, 130, 163, 165, 168, 165, 168, 168, 160, 163,
+ 165, 168, 75, 75, 75, 75, 75, 16, 75, 17,
+ 75, 75, 75, 75, 27, 75, 75, 75, 75, 75,
- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
- 71, 71, 71, 65, 71, 124, 159, 161, 164, 161,
- 164, 164, 156, 159, 161, 164, 71, 71, 71, 18,
- 71, 71, 71, 52, 71, 71, 71, 71, 71, 71,
- 123, 122, 9, 71, 71, 14, 71, 71, 71, 71,
- 71, 71, 71, 71
+ 75, 75, 75, 75, 75, 75, 75, 74, 75, 131,
+ 159, 163, 165, 168, 159, 165, 168, 159, 168, 159,
+ 160, 163, 165, 168, 75, 75, 75, 75, 75, 75,
+ 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
+ 75, 75, 69, 75, 128, 163, 165, 168, 165, 168,
+ 168, 160, 163, 165, 168, 75, 75, 75, 18, 75,
+ 75, 75, 75, 75, 75, 56, 75, 75, 75, 75,
+ 75, 75, 127, 126, 9, 75, 75, 14, 75, 75,
+ 75, 75, 75, 75, 75, 75
} ;
-static yyconst flex_int16_t yy_accept[568] =
+static yyconst flex_int16_t yy_accept[596] =
{ 0,
1, 3, 5, 6, 7, 8, 9, 11, 13, 14,
15, 17, 19, 21, 23, 25, 27, 29, 31, 33,
@@ -502,49 +505,53 @@
415, 419, 423, 424, 425, 426, 427, 428, 428, 428,
429, 429, 429, 429, 430, 431, 433, 434, 435, 437,
439, 441, 443, 445, 446, 448, 449, 450, 451, 452,
- 454, 455, 456, 457, 458, 459, 460, 461, 462, 464,
- 466, 467, 469, 470, 472, 474, 475, 476, 478, 479,
+ 453, 455, 456, 457, 458, 459, 460, 461, 462, 463,
+ 465, 467, 468, 470, 471, 473, 475, 476, 477, 478,
- 481, 482, 483, 484, 485, 486, 487, 488, 490, 491,
- 492, 493, 495, 496, 497, 499, 501, 502, 503, 504,
- 506, 507, 511, 511, 512, 514, 517, 518, 521, 524,
- 526, 528, 530, 532, 534, 536, 537, 538, 539, 539,
- 539, 540, 541, 542, 543, 544, 545, 546, 547, 548,
- 549, 550, 551, 552, 553, 555, 558, 560, 561, 565,
- 566, 567, 567, 568, 568, 568, 569, 570, 571, 572,
- 573, 574, 575, 576, 577, 578, 579, 581, 583, 584,
- 586, 587, 588, 589, 590, 591, 592, 593, 594, 595,
- 596, 597, 599, 600, 601, 602, 603, 605, 606, 608,
+ 480, 481, 483, 484, 485, 486, 487, 488, 489, 490,
+ 492, 493, 494, 495, 497, 498, 499, 501, 503, 504,
+ 505, 506, 508, 509, 513, 513, 514, 516, 519, 520,
+ 523, 526, 528, 530, 532, 534, 536, 538, 539, 540,
+ 541, 541, 541, 542, 543, 544, 545, 546, 547, 548,
+ 549, 550, 551, 552, 553, 554, 555, 557, 560, 562,
+ 563, 567, 568, 569, 569, 570, 570, 570, 571, 572,
+ 573, 574, 575, 576, 577, 578, 579, 580, 581, 582,
+ 584, 586, 587, 589, 590, 591, 592, 593, 594, 595,
+ 596, 597, 598, 599, 600, 602, 603, 604, 605, 606,
- 610, 611, 612, 614, 615, 616, 618, 620, 621, 622,
- 623, 624, 625, 626, 627, 628, 629, 630, 630, 632,
- 633, 635, 637, 639, 641, 642, 643, 646, 648, 649,
- 653, 654, 654, 654, 655, 656, 657, 659, 660, 661,
- 662, 663, 664, 665, 666, 668, 669, 670, 671, 672,
- 674, 675, 677, 679, 681, 683, 685, 686, 687, 689,
- 690, 691, 693, 695, 696, 697, 699, 700, 701, 702,
- 703, 704, 705, 706, 707, 709, 710, 711, 712, 713,
- 715, 717, 718, 719, 720, 721, 722, 723, 723, 723,
- 723, 725, 726, 729, 731, 732, 736, 737, 737, 738,
+ 607, 608, 610, 611, 613, 615, 616, 617, 619, 620,
+ 621, 623, 625, 626, 627, 628, 629, 630, 631, 632,
+ 633, 634, 635, 635, 637, 638, 640, 642, 644, 646,
+ 647, 648, 651, 653, 654, 658, 659, 659, 659, 660,
+ 661, 662, 664, 665, 666, 667, 668, 669, 671, 672,
+ 673, 675, 676, 677, 678, 679, 680, 682, 683, 685,
+ 687, 689, 691, 693, 694, 695, 697, 698, 699, 700,
+ 701, 703, 704, 706, 708, 709, 710, 712, 713, 714,
+ 715, 716, 717, 718, 719, 720, 722, 723, 724, 725,
+ 726, 728, 730, 731, 732, 733, 734, 735, 736, 736,
- 739, 740, 742, 743, 745, 747, 748, 749, 750, 751,
- 752, 753, 754, 755, 756, 757, 758, 759, 760, 761,
- 762, 763, 765, 767, 768, 769, 771, 772, 773, 774,
- 775, 776, 777, 779, 780, 781, 782, 784, 785, 787,
- 789, 790, 790, 791, 791, 791, 791, 794, 796, 797,
- 801, 802, 803, 805, 806, 807, 808, 809, 810, 811,
- 813, 815, 817, 818, 820, 822, 824, 826, 827, 828,
- 829, 830, 832, 833, 835, 836, 838, 840, 841, 843,
- 844, 845, 847, 848, 848, 848, 849, 850, 851, 851,
- 854, 856, 857, 861, 862, 863, 864, 865, 866, 868,
+ 736, 736, 738, 739, 742, 744, 745, 749, 750, 750,
+ 751, 752, 753, 755, 756, 758, 760, 761, 762, 763,
+ 764, 765, 766, 767, 768, 769, 770, 771, 772, 773,
+ 774, 775, 776, 777, 778, 780, 781, 783, 785, 786,
+ 787, 789, 790, 791, 792, 793, 794, 795, 797, 798,
+ 799, 800, 802, 803, 805, 807, 808, 808, 809, 809,
+ 809, 809, 812, 814, 815, 819, 820, 821, 823, 824,
+ 825, 826, 827, 828, 829, 830, 832, 834, 836, 837,
+ 839, 841, 843, 845, 846, 847, 848, 849, 851, 852,
+ 854, 855, 857, 858, 860, 862, 863, 865, 866, 867,
- 870, 871, 872, 874, 875, 876, 877, 878, 879, 880,
- 881, 882, 883, 885, 885, 885, 886, 890, 893, 895,
- 900, 901, 902, 903, 904, 905, 906, 907, 908, 909,
- 910, 911, 912, 913, 914, 916, 917, 917, 920, 922,
- 923, 927, 928, 929, 930, 932, 933, 934, 936, 937,
- 938, 939, 940, 941, 942, 943, 945, 946, 948, 949,
- 950, 951, 952, 953, 954, 955, 955
+ 869, 870, 870, 870, 871, 872, 873, 873, 876, 878,
+ 879, 883, 884, 885, 886, 887, 888, 890, 892, 893,
+ 894, 895, 897, 898, 899, 900, 901, 902, 903, 904,
+ 905, 906, 907, 908, 910, 910, 910, 911, 915, 918,
+ 920, 925, 926, 927, 928, 929, 930, 931, 932, 933,
+ 934, 935, 936, 937, 938, 939, 940, 941, 942, 943,
+ 945, 946, 946, 949, 951, 952, 956, 957, 958, 959,
+ 961, 962, 963, 964, 965, 966, 968, 969, 970, 971,
+ 972, 973, 974, 975, 977, 978, 980, 981, 982, 983,
+ 984, 985, 986, 987, 987
+
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -590,147 +597,153 @@
11, 11, 11, 11, 11, 11, 11, 11, 1, 1
} ;
-static yyconst flex_int16_t yy_base[601] =
+static yyconst flex_int16_t yy_base[629] =
{ 0,
0, 0, 65, 0, 131, 0, 200, 205, 213, 218,
242, 0, 308, 0, 372, 0, 418, 464, 531, 0,
- 601, 671, 1387, 1388, 75, 1388, 1388, 0, 72, 74,
- 308, 1388, 415, 331, 355, 107, 1365, 1388, 1388, 0,
- 0, 1364, 0, 1388, 1388, 1343, 1334, 1325, 52, 1319,
- 1323, 1313, 0, 1388, 1388, 1388, 0, 171, 383, 310,
- 345, 20, 1326, 1320, 57, 178, 1328, 177, 404, 1327,
- 409, 1311, 192, 426, 55, 1317, 1328, 0, 1304, 0,
- 1388, 0, 100, 1388, 0, 0, 0, 0, 0, 1388,
- 1388, 1388, 486, 113, 1349, 1388, 740, 615, 628, 631,
+ 601, 671, 1419, 1420, 75, 1420, 1420, 0, 72, 74,
+ 308, 1420, 415, 331, 355, 107, 1397, 1420, 1420, 0,
+ 0, 1396, 0, 1420, 1420, 1375, 1366, 1357, 52, 1351,
+ 1355, 1345, 0, 1420, 1420, 1420, 0, 171, 383, 310,
+ 345, 20, 1358, 1352, 57, 178, 1360, 177, 406, 1359,
+ 410, 1343, 192, 445, 55, 1349, 1360, 0, 1336, 0,
+ 1420, 0, 100, 1420, 0, 0, 0, 0, 0, 1420,
+ 1420, 1420, 502, 113, 1381, 1420, 740, 447, 469, 615,
- 635, 685, 0, 1332, 171, 0, 1327, 0, 177, 699,
- 705, 1313, 249, 1300, 1341, 324, 1388, 1388, 487, 1340,
- 1339, 1338, 1292, 0, 193, 278, 1319, 1388, 1293, 0,
- 0, 305, 1337, 1336, 1335, 0, 354, 0, 328, 378,
- 500, 1388, 1388, 1388, 1388, 0, 405, 624, 694, 0,
- 450, 1334, 1388, 1388, 1388, 1388, 1388, 1310, 1304, 1388,
- 1295, 1301, 1344, 0, 1302, 0, 1286, 320, 1290, 1298,
- 1301, 0, 0, 1284, 0, 308, 1280, 419, 323, 0,
- 1287, 1297, 1288, 1285, 1276, 1283, 1280, 1279, 0, 0,
- 1267, 0, 1289, 0, 0, 1277, 1267, 0, 1264, 0,
+ 628, 631, 0, 1364, 171, 0, 1359, 0, 177, 685,
+ 699, 1345, 249, 1332, 1373, 324, 1420, 1420, 601, 1372,
+ 1371, 1370, 1324, 0, 193, 278, 1351, 1420, 1325, 0,
+ 0, 305, 1369, 1368, 1367, 0, 354, 0, 328, 378,
+ 500, 1420, 1420, 1420, 1420, 0, 405, 637, 649, 0,
+ 642, 1366, 1420, 1420, 1420, 1420, 1420, 1342, 1336, 1420,
+ 1327, 1333, 1376, 0, 1334, 0, 1318, 320, 1322, 1330,
+ 1333, 0, 0, 1316, 0, 1323, 308, 1311, 645, 323,
+ 0, 1318, 1328, 1319, 1316, 1307, 1314, 1311, 1310, 0,
+ 0, 1298, 0, 1320, 0, 0, 1308, 318, 1298, 0,
- 1285, 1276, 1280, 1274, 1278, 604, 1260, 1263, 1256, 64,
- 1274, 0, 281, 1262, 1275, 360, 1256, 1270, 0, 445,
- 0, 1295, 713, 1388, 805, 851, 731, 0, 0, 810,
- 827, 856, 885, 890, 907, 1388, 1388, 1388, 1285, 1275,
- 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 0, 0,
- 1292, 1291, 0, 0, 408, 705, 711, 0, 473, 1388,
- 1388, 1264, 1388, 1250, 1259, 1302, 1264, 1262, 1252, 1251,
- 407, 1259, 1238, 1239, 351, 1253, 0, 1251, 1254, 1245,
- 1252, 1237, 1249, 1231, 1238, 1234, 1232, 1227, 1231, 1242,
- 1239, 436, 1237, 1222, 1216, 1226, 0, 1219, 1228, 1222,
+ 1295, 0, 1316, 1307, 1311, 1305, 1309, 654, 1291, 1294,
+ 1287, 64, 1305, 0, 281, 1293, 1306, 360, 1287, 1301,
+ 0, 479, 0, 1326, 708, 1420, 805, 851, 717, 0,
+ 0, 734, 810, 840, 869, 874, 897, 1420, 1420, 1420,
+ 1316, 1306, 1420, 1420, 1420, 1420, 1420, 1420, 1420, 1420,
+ 0, 0, 1323, 1322, 0, 0, 408, 706, 746, 0,
+ 621, 1420, 1420, 1295, 1420, 1281, 1290, 1333, 1295, 1293,
+ 1283, 1282, 449, 1290, 1269, 1270, 1270, 351, 1283, 1278,
+ 1280, 1283, 1274, 1281, 1266, 1278, 1260, 1267, 1263, 1261,
+ 1256, 1260, 1271, 1268, 684, 470, 1270, 1265, 1250, 1244,
- 1226, 871, 1214, 1228, 439, 0, 0, 1210, 1226, 1215,
- 1214, 1223, 1224, 1206, 1216, 1221, 1218, 1254, 958, 918,
- 929, 935, 952, 963, 1388, 1388, 746, 799, 0, 493,
- 1388, 1216, 1209, 1208, 1215, 1198, 0, 1212, 1205, 1204,
- 1208, 1206, 1210, 1209, 1200, 1189, 1204, 1203, 453, 0,
- 1194, 0, 0, 0, 0, 0, 1187, 1183, 1202, 1193,
- 1185, 0, 0, 1197, 1179, 0, 1174, 1179, 1177, 1175,
- 1188, 1172, 1186, 1173, 1189, 1183, 1179, 1186, 1179, 0,
- 0, 1181, 1178, 1167, 1163, 1161, 1161, 0, 1191, 641,
- 1200, 1195, 896, 976, 0, 794, 1388, 1147, 1150, 1138,
+ 1254, 0, 1247, 1256, 1250, 1254, 815, 1242, 1256, 405,
+ 0, 0, 1238, 1254, 1243, 1242, 1251, 1252, 1234, 1244,
+ 1249, 1246, 1282, 948, 902, 919, 925, 942, 953, 1420,
+ 1420, 799, 823, 0, 628, 1420, 1244, 1237, 1236, 1243,
+ 1226, 0, 1240, 1233, 1232, 1236, 1234, 0, 1238, 1237,
+ 1228, 1227, 1216, 1231, 1230, 437, 0, 1221, 0, 0,
+ 0, 0, 0, 1214, 1210, 1229, 1220, 1226, 1211, 1204,
+ 0, 1209, 0, 0, 1221, 1203, 0, 1198, 1203, 1201,
+ 1199, 1212, 1196, 1210, 1197, 1213, 1207, 1203, 1210, 1203,
+ 0, 0, 1205, 1202, 1194, 1194, 1196, 1201, 0, 1231,
- 1125, 0, 1140, 0, 0, 1122, 1125, 1120, 1114, 1127,
- 1123, 1123, 1113, 1104, 1116, 1115, 1113, 1105, 1100, 1079,
- 1083, 0, 0, 1066, 1041, 0, 1039, 1036, 1022, 1025,
- 1021, 1018, 0, 1019, 1004, 923, 0, 926, 0, 0,
- 910, 0, 955, 946, 945, 0, 981, 992, 0, 823,
- 1388, 912, 0, 906, 350, 895, 895, 892, 868, 875,
- 0, 0, 869, 0, 0, 0, 0, 848, 830, 836,
- 832, 0, 829, 0, 820, 0, 0, 821, 802, 817,
- 799, 0, 798, 830, 0, 1388, 1388, 1388, 818, 997,
- 1002, 0, 840, 772, 767, 735, 707, 707, 0, 0,
+ 794, 1240, 1239, 891, 914, 0, 886, 1420, 1194, 1197,
+ ...
[truncated message content] |
|
From: <bla...@us...> - 2008-05-31 20:59:21
|
Revision: 18817
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18817&view=rev
Author: blackystardust
Date: 2008-05-31 13:59:20 -0700 (Sat, 31 May 2008)
Log Message:
-----------
Fixed some minix 3.x and qnx 4.x issues
Modified Paths:
--------------
branches/marco/ports/vice/build/qnx4/build.sh
branches/marco/ports/vice/configure.in
branches/marco/ports/vice/src/arch/unix/x11/renderxv.c
branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c
branches/marco/ports/vice/src/network.c
branches/marco/ports/vice/src/video/video-resources.c
Modified: branches/marco/ports/vice/build/qnx4/build.sh
===================================================================
--- branches/marco/ports/vice/build/qnx4/build.sh 2008-05-30 11:45:04 UTC (rev 18816)
+++ branches/marco/ports/vice/build/qnx4/build.sh 2008-05-31 20:59:20 UTC (rev 18817)
@@ -12,7 +12,9 @@
mv src/plus4/Makefile.in src/plus4/Makefile.in.orig
sed s/"-rm -f libplus4.a"/"-rm -f -r libplus4.a;cp plus4mem.o ..\/;mv plus4mem.c plus4mem2.c;echo >plus4mem.c;$\(CC\) -c -o plus4mem.o plus4mem.c;mv plus4mem2.c plus4mem.c"/ <src/plus4/Makefile.in.orig >src/plus4/Makefile.in
+mv src/monitor/Makefile.in src/monitor/Makefile.in.orig
+sed s/"-rm -f libmonitor.a"/"-rm -f -r libmonitor.a;cp monitor.o ..\/;mv monitor.c monitor2.c;echo >monitor.c;$\(CC\) -c -o monitor.o monitor.c;mv monitor2.c monitor.c"/ <src/monitor/Makefile.in.orig >src/monitor/Makefile.in
mv src/Makefile.in src/Makefile.in.orig
-sed s/"@XPLUS4_WINRES@"/"plus4mem.o"/ <src/Makefile.in.orig >src/Makefile.in
+sed -e s/"@X128_WINRES@"/"monitor.o"/ -e s/"@X64_WINRES@"/"monitor.o"/ -e s/"@XVIC_WINRES@"/"monitor.o"/ -e s/"@XPET_WINRES@"/"monitor.o"/ -e s/"@XPLUS4_WINRES@"/"plus4mem.o monitor.o"/ -e s/"@XCBM2_WINRES@"/"monitor.o"/ <src/Makefile.in.orig >src/Makefile.in
./configure -v --prefix=/usr/local cross_compiling=yes ac_cv_c_bigendian=no
make
Modified: branches/marco/ports/vice/configure.in
===================================================================
--- branches/marco/ports/vice/configure.in 2008-05-30 11:45:04 UTC (rev 18816)
+++ branches/marco/ports/vice/configure.in 2008-05-31 20:59:20 UTC (rev 18817)
@@ -119,6 +119,7 @@
if test x"$host_os" = "xminix"; then
AC_DEFINE(MINIX_SUPPORT,,[do we need minix support])
+ CFLAGS="$CFLAGS -D_MINIX -D_POSIX_SOURCE"
fi
if test x"$host_os" = "xcygwin32" -o x"$host_os" = "xcygwin"; then
Modified: branches/marco/ports/vice/src/arch/unix/x11/renderxv.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/renderxv.c 2008-05-30 11:45:04 UTC (rev 18816)
+++ branches/marco/ports/vice/src/arch/unix/x11/renderxv.c 2008-05-31 20:59:20 UTC (rev 18817)
@@ -41,6 +41,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef __minix
+#include <stdlib.h>
+#endif
+
#if defined(__QNX__) || defined(MINIX_SUPPORT)
Status XShmAttach(Display *display, XShmSegmentInfo *shminfo)
{
Modified: branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c 2008-05-30 11:45:04 UTC (rev 18816)
+++ branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c 2008-05-31 20:59:20 UTC (rev 18817)
@@ -631,7 +631,7 @@
return 0;
}
-GC video_get_gc(XGCValues *gc_values)
+static GC video_get_gc(XGCValues *gc_values)
{
Display *display;
@@ -824,7 +824,7 @@
/* ------------------------------------------------------------------------- */
-void video_refresh_func(void (*rfunc)(void))
+static void video_refresh_func(void (*rfunc)(void))
{
_refresh_func = rfunc;
}
Modified: branches/marco/ports/vice/src/network.c
===================================================================
--- branches/marco/ports/vice/src/network.c 2008-05-30 11:45:04 UTC (rev 18816)
+++ branches/marco/ports/vice/src/network.c 2008-05-31 20:59:20 UTC (rev 18817)
@@ -30,9 +30,11 @@
#ifdef HAVE_NETWORK
#ifdef MINIX_SUPPORT
-#define _POSIX_SOURCE
#include <limits.h>
#define PF_INET AF_INET
+
+extern ssize_t recv(int socket, void *buffer, size_t length, int flags);
+extern ssize_t send(int socket, const void *buffer, size_t length, int flags);
#endif
#include <assert.h>
@@ -100,6 +102,12 @@
#include <unistd.h>
#endif
+#ifdef __minix
+#define recv(socket, buffer, length, flags) \
+ recvfrom(socket, buffer, length, flags, NULL, NULL)
+extern ssize_t send(int socket, const void *buffer, size_t length, int flags);
+#endif
+
#ifdef OPENSERVER6_COMPILE
struct timeval {
long tv_sec;
Modified: branches/marco/ports/vice/src/video/video-resources.c
===================================================================
--- branches/marco/ports/vice/src/video/video-resources.c 2008-05-30 11:45:04 UTC (rev 18816)
+++ branches/marco/ports/vice/src/video/video-resources.c 2008-05-31 20:59:20 UTC (rev 18817)
@@ -600,7 +600,7 @@
lib_free(canvas->videoconfig->external_palette_name);
}
-void video_resources_update_ui(video_canvas_t *canvas)
+static void video_resources_update_ui(video_canvas_t *canvas)
{
int pal_enabled = 0;
int ui_doublescan_enabled, ui_scale2x_enabled;
@@ -627,4 +627,3 @@
ui_enable_chip resources(ui_doublescan_enabled, ui_scale2x_enabled);
*/
}
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2008-05-30 11:44:58
|
Revision: 18816
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18816&view=rev
Author: amatthies
Date: 2008-05-30 04:45:04 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Fixed compiler warnings.
Modified Paths:
--------------
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/archdep.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/fullscrn.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/statusbar.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/ui.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uimon.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uivideo.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/utils/genwinres.c
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/archdep.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/archdep.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/archdep.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -185,7 +185,7 @@
BYTE *version_info_buffer = lib_malloc(version_info_size);
if (GetFileVersionInfo(file_name, (DWORD)NULL, version_info_size, (VOID*)version_info_buffer)) {
- if (VerQueryValue(version_info_buffer, "\\StringFileInfo\\04090000\\CompanyName", &company_name, &company_name_length)) {
+ if (VerQueryValue(version_info_buffer, "\\StringFileInfo\\04090000\\CompanyName", (void*)&company_name, &company_name_length)) {
if (company_name) {
if (strncmp("Vice Team", company_name, company_name_length) == 0) {
bResult = TRUE;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/fullscrn.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/fullscrn.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/fullscrn.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -586,7 +586,7 @@
switch (msg) {
case WM_NOTIFY:
- if (((NMHDR FAR *)lparam)->code == PSN_APPLY) {
+ if (((NMHDR FAR *)lparam)->code == (UINT)PSN_APPLY) {
fullscreen_dialog_end();
SetWindowLong(hwnd, DWL_MSGRESULT, FALSE);
return TRUE;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/statusbar.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/statusbar.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/statusbar.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -560,10 +560,10 @@
slider_pos = SendMessage(slider_hwnd[window_index], TBM_GETPOS, 0, 0);
resources_set_int("SoundVolume", 100 - slider_pos);
- if (nmhdr->code == NM_RELEASEDCAPTURE)
+ if (nmhdr->code == (UINT)NM_RELEASEDCAPTURE)
SetFocus(window);
- if (nmhdr->code == NM_CUSTOMDRAW) {
+ if (nmhdr->code == (UINT)NM_CUSTOMDRAW) {
NMCUSTOMDRAW *lpNMCustomDraw = (NMCUSTOMDRAW*)lparam;
#ifndef CDIS_FOCUS
#define CDIS_FOCUS 16
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/ui.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/ui.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/ui.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -218,7 +218,6 @@
/* ------------------------------------------------------------------------ */
static HWND main_hwnd;
-static HWND slider_hwnd;
static int emu_menu;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uimon.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uimon.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uimon.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -669,7 +669,7 @@
{
ret = GetByte(&(pwd->pMonitorDimensions),&pwd->MonitorLen);
- if (pwd->MonitorLen < sizeof(WINDOWPLACEMENT))
+ if (pwd->MonitorLen < (int)sizeof(WINDOWPLACEMENT))
{
ret = WT_END;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uivideo.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uivideo.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uivideo.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -274,7 +274,7 @@
switch (msg) {
case WM_NOTIFY:
- if (((NMHDR FAR *)lparam)->code == PSN_APPLY) {
+ if (((NMHDR FAR *)lparam)->code == (UINT)PSN_APPLY) {
GetDlgItemText(hwnd, IDC_VIDEO_COLORS_SAT, s, 100);
_stscanf(s, TEXT("%f"), &tf);
ival = (int)(tf * 1000.0 + 0.5);
@@ -318,7 +318,7 @@
switch (msg) {
case WM_NOTIFY:
- if (((NMHDR FAR *)lparam)->code == PSN_APPLY) {
+ if (((NMHDR FAR *)lparam)->code == (UINT)PSN_APPLY) {
GetDlgItemText(hwnd, IDC_VIDEO_COLORS_GAM, s, 100);
_stscanf(s, TEXT("%f"), &tf);
ival = (int)(tf * 1000.0 + 0.5);
@@ -423,7 +423,7 @@
switch (msg) {
case WM_NOTIFY:
- if (((NMHDR FAR *)lparam)->code == PSN_APPLY) {
+ if (((NMHDR FAR *)lparam)->code == (UINT)PSN_APPLY) {
querynewpalette = 1;
if (resources_set_string(current_chip2->res_PaletteFile_name,
palette_file2) < 0) {
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/utils/genwinres.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/utils/genwinres.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/utils/genwinres.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -40,8 +40,8 @@
{
FILE *infile;
int state;
-int res_value;
-int is_idm;
+int res_value = 0;
+int is_idm = 0;
infile = fopen(filename, "rb");
if (infile) {
@@ -159,7 +159,7 @@
}
-void main(int argc, char **argv)
+int main(int argc, char **argv)
{
FILE *houtput, *moutput;
int i;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2008-05-30 10:13:53
|
Revision: 18815
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18815&view=rev
Author: amatthies
Date: 2008-05-30 03:13:59 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Fixed sprite initialization bug for border modes. Added parentheses in vicii_sprites_set_x_position().
Modified Paths:
--------------
branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.c
branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.h
branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.c
branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.h
branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.c
branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.h
branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii.c
Modified: branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.c 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.c 2008-05-30 10:13:59 UTC (rev 18815)
@@ -39,7 +39,7 @@
static void raster_sprite_status_init(raster_sprite_status_t *status,
- unsigned int num_sprites)
+ unsigned int num_sprites, int sprite_offset)
{
status->num_sprites = num_sprites;
status->cache_init_func = raster_sprite_cache_init;
@@ -58,7 +58,7 @@
status->sprite_data_2 = NULL;
}
- raster_sprite_status_reset(status);
+ raster_sprite_status_reset(status, sprite_offset);
}
static void raster_sprite_status_shutdown(raster_sprite_status_t *status,
@@ -71,11 +71,11 @@
}
}
-void raster_sprite_status_new(raster_t *raster, unsigned int num_sprites)
+void raster_sprite_status_new(raster_t *raster, unsigned int num_sprites, int sprite_offset)
{
raster->sprite_status = (raster_sprite_status_t *)lib_malloc(
sizeof(raster_sprite_status_t));
- raster_sprite_status_init(raster->sprite_status, num_sprites);
+ raster_sprite_status_init(raster->sprite_status, num_sprites, sprite_offset);
}
void raster_sprite_status_destroy(raster_t *raster)
@@ -87,7 +87,7 @@
}
}
-void raster_sprite_status_reset(raster_sprite_status_t *status)
+void raster_sprite_status_reset(raster_sprite_status_t *status, int sprite_offset)
{
unsigned int i;
@@ -105,7 +105,7 @@
status->new_sprite_data = status->sprite_data_2;
for (i = 0; i < status->num_sprites; i++)
- raster_sprite_reset(&status->sprites[i]);
+ raster_sprite_reset(&status->sprites[i], sprite_offset);
}
void raster_sprite_status_set_draw_function(raster_sprite_status_t *status,
Modified: branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.h
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.h 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite-status.h 2008-05-30 10:13:59 UTC (rev 18815)
@@ -85,9 +85,9 @@
struct raster_s;
extern void raster_sprite_status_new(struct raster_s *raster,
- unsigned int num_sprites);
+ unsigned int num_sprites, int sprite_offset);
extern void raster_sprite_status_destroy(struct raster_s *raster);
-extern void raster_sprite_status_reset(raster_sprite_status_t *status);
+extern void raster_sprite_status_reset(raster_sprite_status_t *status, int sprite_offset);
extern void raster_sprite_status_set_draw_function(
raster_sprite_status_t *status,
raster_sprite_status_draw_function_t function);
Modified: branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.c 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.c 2008-05-30 10:13:59 UTC (rev 18815)
@@ -29,9 +29,9 @@
#include "raster-sprite.h"
-void raster_sprite_reset(raster_sprite_t *s)
+void raster_sprite_reset(raster_sprite_t *s, int sprite_offset)
{
- s->x = 8;
+ s->x = sprite_offset;
s->y = 0;
s->x_expanded = 0;
s->y_expanded = 0;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.h
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.h 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/raster/raster-sprite.h 2008-05-30 10:13:59 UTC (rev 18815)
@@ -71,7 +71,7 @@
typedef struct raster_sprite_s raster_sprite_t;
-extern void raster_sprite_reset(raster_sprite_t *s);
+extern void raster_sprite_reset(raster_sprite_t *s, int sprite_offset);
#endif
Modified: branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.c 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.c 2008-05-30 10:13:59 UTC (rev 18815)
@@ -1170,7 +1170,7 @@
sprite = vicii.raster.sprite_status->sprites + num;
- x_offset = vicii.screen_leftborderwidth - 24;
+ x_offset = vicii_sprite_offset();
/* Handle spritegap in NTSC mode */
if (vicii.sprite_wrap_x > 0x200 && (unsigned int)new_x > 0x187)
@@ -1211,30 +1211,32 @@
sprite->x = vicii.sprite_wrap_x;
} else {
/* display already started on last_pos, change on next fetch */
- if (raster_x + 8 < new_x && sprite->x > raster_x + 8)
+ if (raster_x + 8 < new_x && sprite->x > raster_x + 8) {
/* last line was already drawn */
sprite->x = new_x;
- else
+ } else {
raster_changes_sprites_add_int(&vicii.raster,
SPRITE_DISPLAY_IMMEDIATE_DATA_FETCHED(num),
&sprite->x, new_x);
+ }
}
}
} else {
/* next_pos >= last_pos */
- if (change_pos <= last_pos)
- {
+ if (change_pos <= last_pos) {
/* display not started yet, use next_pos */
sprite->x = new_x;
} else {
- if (change_pos >= next_pos)
- if (raster_x + 8 < sprite->x && new_x > raster_x + 8)
+ if (change_pos >= next_pos) {
+ if (raster_x + 8 < sprite->x && new_x > raster_x + 8) {
/* last line was already drawn */
sprite->x = new_x;
- else
- /* display already started on last_pos, change on next fetch */
- raster_changes_sprites_add_int(&vicii.raster,
- SPRITE_DISPLAY_IMMEDIATE_DATA_FETCHED(num), &sprite->x, new_x);
+ } else {
+ /* display already started on last_pos, change on next fetch */
+ raster_changes_sprites_add_int(&vicii.raster,
+ SPRITE_DISPLAY_IMMEDIATE_DATA_FETCHED(num), &sprite->x, new_x);
+ }
+ }
}
}
raster_changes_sprites_add_int(&vicii.raster,
@@ -1271,3 +1273,7 @@
lib_free(sprline);
}
+int vicii_sprite_offset(void)
+{
+ return vicii.screen_leftborderwidth - 24;
+}
Modified: branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.h
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.h 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii-sprites.h 2008-05-30 10:13:59 UTC (rev 18815)
@@ -49,6 +49,7 @@
extern void vicii_sprites_reset_sprline(void);
extern void vicii_sprites_init_sprline(void);
extern void vicii_sprites_reset_xshift(void);
+extern int vicii_sprite_offset(void);
#endif
Modified: branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii.c 2008-05-29 12:15:14 UTC (rev 18814)
+++ branches/amatthies/v1.22.16-sprites/vice/src/vicii/vicii.c 2008-05-30 10:13:59 UTC (rev 18815)
@@ -298,7 +298,7 @@
raster = &vicii.raster;
video_color_set_canvas(raster->canvas);
- raster_sprite_status_new(raster, VICII_NUM_SPRITES);
+ raster_sprite_status_new(raster, VICII_NUM_SPRITES, vicii_sprite_offset());
raster_line_changes_sprite_init(raster);
if (raster_init(raster, VICII_NUM_VMODES) < 0)
@@ -427,7 +427,7 @@
for (i = 0; i <= 0x3f; i++)
vicii_store(i, 0);
- raster_sprite_status_reset(vicii.raster.sprite_status);
+ raster_sprite_status_reset(vicii.raster.sprite_status, vicii_sprite_offset());
}
/* This /should/ put the VIC-II in the same state as after a powerup, if
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2008-05-29 12:15:08
|
Revision: 18814
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18814&view=rev
Author: amatthies
Date: 2008-05-29 05:15:14 -0700 (Thu, 29 May 2008)
Log Message:
-----------
Branch for sprite fixes
Added Paths:
-----------
branches/amatthies/v1.22.16-sprites/
Copied: branches/amatthies/v1.22.16-sprites (from rev 18813, tags/v1.22/v1.22.16)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-05-28 05:55:31
|
Revision: 18813
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18813&view=rev
Author: blackystardust
Date: 2008-05-27 22:55:36 -0700 (Tue, 27 May 2008)
Log Message:
-----------
Fixed some solaris warnings/issues
Modified Paths:
--------------
branches/marco/ports/vice/src/sounddrv/soundsun.c
Modified: branches/marco/ports/vice/src/sounddrv/soundsun.c
===================================================================
--- branches/marco/ports/vice/src/sounddrv/soundsun.c 2008-05-25 23:18:21 UTC (rev 18812)
+++ branches/marco/ports/vice/src/sounddrv/soundsun.c 2008-05-28 05:55:36 UTC (rev 18813)
@@ -155,7 +155,7 @@
static int sun_write(SWORD *pbuf, size_t nr)
{
- int total, i, now;
+ unsigned int total, i, now;
if (sun_8bit)
{
/* XXX: ugly to change contents of the buffer */
@@ -183,7 +183,10 @@
static int sun_bufferspace(void)
{
- int st, size;
+ int st;
+#if defined(__NetBSD__)
+ int size;
+#endif
struct audio_info info;
/* ioctl(fd, AUDIO_GET_STATUS, &info) yields number of played samples
in info.play.samples. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-05-25 23:18:13
|
Revision: 18812
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18812&view=rev
Author: blackystardust
Date: 2008-05-25 16:18:21 -0700 (Sun, 25 May 2008)
Log Message:
-----------
Fixed some hpux warning/issues
Modified Paths:
--------------
branches/marco/ports/vice/src/sounddrv/soundhpux.c
Modified: branches/marco/ports/vice/src/sounddrv/soundhpux.c
===================================================================
--- branches/marco/ports/vice/src/sounddrv/soundhpux.c 2008-05-25 23:14:26 UTC (rev 18811)
+++ branches/marco/ports/vice/src/sounddrv/soundhpux.c 2008-05-25 23:18:21 UTC (rev 18812)
@@ -35,6 +35,10 @@
#include <fcntl.h>
#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#include "sound.h"
static int hpux_fd = -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-05-25 23:14:18
|
Revision: 18811
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18811&view=rev
Author: blackystardust
Date: 2008-05-25 16:14:26 -0700 (Sun, 25 May 2008)
Log Message:
-----------
Updated to 1.22.16
Modified Paths:
--------------
branches/marco/ports/vice/ChangeLog
branches/marco/ports/vice/Makefile.am
branches/marco/ports/vice/aclocal.m4
branches/marco/ports/vice/autogen.sh
branches/marco/ports/vice/build/Makefile.am
branches/marco/ports/vice/configure.in
branches/marco/ports/vice/data/C64/Makefile.am
branches/marco/ports/vice/data/C64/osx_pos.vkm
branches/marco/ports/vice/data/C64/osx_sym.vkm
branches/marco/ports/vice/depcomp
branches/marco/ports/vice/missing
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/stamp-cat-id
branches/marco/ports/vice/po/sv.po
branches/marco/ports/vice/po/vice.pot
branches/marco/ports/vice/src/ChangeLog
branches/marco/ports/vice/src/arch/unix/archdep.c
branches/marco/ports/vice/src/arch/unix/archdep.h
branches/marco/ports/vice/src/arch/unix/macosx/Info.plist
branches/marco/ports/vice/src/arch/unix/macosx/Makefile.am
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/classes.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/info.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/classes.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/info.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/classes.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/info.nib
branches/marco/ports/vice/src/arch/unix/macosx/Resources/Makefile.am
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/console.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.am
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/fullscreen.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/kbd.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/kbd.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/main.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/c64controller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/c64controller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/c64machinecontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/uimon.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/viceapplication.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/viceapplication.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/vicemachine.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/vicemachine.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/video.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/videoarch.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/consolewindow.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/fullscreenwindow.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/joystickview.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/keypressview.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/viceglview.h
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/viceglview.m
branches/marco/ports/vice/src/arch/unix/macosx/cocoa/view/vicewindow.m
branches/marco/ports/vice/src/arch/unix/macosx/make-bindist.sh
branches/marco/ports/vice/src/arch/win32/signals.c
branches/marco/ports/vice/src/resid/aclocal.m4
branches/marco/ports/vice/src/resid/config.guess
branches/marco/ports/vice/src/resid/config.sub
branches/marco/ports/vice/src/resid/configure
branches/marco/ports/vice/src/resid/depcomp
branches/marco/ports/vice/src/resid/install-sh
branches/marco/ports/vice/src/resid/missing
branches/marco/ports/vice/src/resid/mkinstalldirs
branches/marco/ports/vice/src/version.h
Modified: branches/marco/ports/vice/ChangeLog
===================================================================
--- branches/marco/ports/vice/ChangeLog 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/ChangeLog 2008-05-25 23:14:26 UTC (rev 18811)
@@ -1,3 +1,33 @@
+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-19 Spiro Trikaliotis <spi...@gm...>
+
+ * autogen.sh: Removed "bash-ism" from script (compare with "=="
+ instead of "=").
+
+2008-05-19 Spiro Trikaliotis <spi...@gm...>
+
+ * depcomp, missing, aclocal.m4, po/stamp-cat-id, po/vice.pot,
+ po/fr.gmo, po/nl.gmo, po/pl.gmo, po/hu.gmo, po/it.gmo,
+ po/de.gmo, po/sv.gmo: Removed some more auto-generated or
+ unnecessary files.
+
2008-05-18 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.15.
Modified: branches/marco/ports/vice/Makefile.am
===================================================================
--- branches/marco/ports/vice/Makefile.am 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/Makefile.am 2008-05-25 23:14:26 UTC (rev 18811)
@@ -60,10 +60,10 @@
if UNIX_MACOSX_COMPILE
bindist:
- $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@
+ /bin/bash @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@
bindistzip:
- $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@
+ /bin/bash @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@
endif
if UNIX_SKYOS_COMPILE
Modified: branches/marco/ports/vice/aclocal.m4
===================================================================
--- branches/marco/ports/vice/aclocal.m4 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/aclocal.m4 2008-05-25 23:14:26 UTC (rev 18811)
@@ -1,884 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.6])])
-
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $1 | $1:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_PROG_LEX
-# -----------
-# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a
-# "missing" invocation, for better error output.
-AC_DEFUN([AM_PROG_LEX],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
-AC_REQUIRE([AC_PROG_LEX])dnl
-if test "$LEX" = :; then
- LEX=${am_missing_run}flex
-fi])
-
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake. There are at least two reasons why we must not
-# use `-m 0755':
-# - it causes special bits like SGID to be ignored,
-# - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out. Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Check how to create a tarball. -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-# tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-# $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
-
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
- rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([acinclude.m4])
Modified: branches/marco/ports/vice/autogen.sh
===================================================================
--- branches/marco/ports/vice/autogen.sh 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/autogen.sh 2008-05-25 23:14:26 UTC (rev 18811)
@@ -89,7 +89,7 @@
buildfiles
-if [ x"$1" == x"--dist" ]; then
+if [ x"$1" = x"--dist" ]; then
./configure
(cd src/monitor/; make mon_lex.c mon_parse.c)
Modified: branches/marco/ports/vice/build/Makefile.am
===================================================================
--- branches/marco/ports/vice/build/Makefile.am 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/build/Makefile.am 2008-05-25 23:14:26 UTC (rev 18811)
@@ -11,6 +11,7 @@
macosx/build-readline.sh \
macosx/build-vice-dist.sh \
macosx/build-ffmpeglame.sh \
+ macosx/build-vice-release.sh \
minix3/build.sh \
minix3/build-package.sh \
qnx4/build.sh \
Modified: branches/marco/ports/vice/configure.in
===================================================================
--- branches/marco/ports/vice/configure.in 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/configure.in 2008-05-25 23:14:26 UTC (rev 18811)
@@ -9,7 +9,7 @@
VICE_VERSION_MAJOR=1
VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=15
+VICE_VERSION_BUILD=16
AC_SUBST(VICE_VERSION_MAJOR)
AC_SUBST(VICE_VERSION_MINOR)
@@ -102,7 +102,9 @@
dnl --- setup Objective-C ---
OBJC="${CC}"
-OBJCFLAGS="${CFLAGS}"
+if [ "x${OBJCFLAGS}" = x ]; then
+ OBJCFLAGS="${CFLAGS}"
+fi
OBJCDEPMODE="depmode=${CC}"
AC_SUBST(OBJC)
AC_SUBST(OBJCFLAGS)
@@ -1834,7 +1836,7 @@
ARCH_LIBS="$ARCH_DIR/macosx/cocoa/menu/libarchmacosxcocoamenu.a $ARCH_DIR/macosx/cocoa/dialog/libarchmacosxcocoadialog.a $ARCH_DIR/macosx/cocoa/libarchmacosxcocoa.a $ARCH_DIR/macosx/cocoa/view/libarchmacosxcocoaview.a $ARCH_DIR/macosx/libarchmacosx.a $ARCH_DIR/libarch.a $ARCH_LIBS"
ARCH_INCLUDES="-I$ARCH_SRC_DIR/macosx/cocoa/menu -I$ARCH_SRC_DIR/macosx/cocoa/dialog -I$ARCH_SRC_DIR/macosx/cocoa/view -I$ARCH_SRC_DIR/macosx/cocoa -I$ARCH_SRC_DIR $ARCH_INCLUDES"
ARCH_EXTRA_SUBDIR="macosx macosx/cocoa macosx/cocoa/view macosx/cocoa/menu macosx/cocoa/dialog"
- UI_LIBS="-framework Cocoa -framework OpenGL"
+ UI_LIBS="-framework Cocoa -framework OpenGL -framework Carbon"
UNIX_MACOSX_UITYPE=cocoa
else
ARCH_LIBS="$ARCH_DIR/macosx/libarchmacosx.a $ARCH_LIBS"
Modified: branches/marco/ports/vice/data/C64/Makefile.am
===================================================================
--- branches/marco/ports/vice/data/C64/Makefile.am 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/data/C64/Makefile.am 2008-05-25 23:14:26 UTC (rev 18811)
@@ -21,7 +21,8 @@
os2.vkm \
os2_sym.vkm \
osx_pos.vkm \
- osx_sym.vkm \
+ osx_sym_de.vkm \
+ osx_sym_us.vkm \
pc64.vpl \
ROdflt.vkm \
vice.vpl \
Modified: branches/marco/ports/vice/data/C64/osx_pos.vkm
===================================================================
--- branches/marco/ports/vice/data/C64/osx_pos.vkm 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/data/C64/osx_pos.vkm 2008-05-25 23:14:26 UTC (rev 18811)
@@ -21,15 +21,8 @@
# 2 left shift
# 4 right shift
# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
!CLEAR
!LSHIFT 1 7
@@ -42,7 +35,7 @@
3 2 5 8 /* F -> F */
4 3 5 8 /* H -> H */
5 3 2 8 /* G -> G */
-6 3 1 8 /* Y -> Y */
+6 1 4 8 /* Y -> Z */
7 2 7 8 /* X -> X */
8 2 4 8 /* C -> C */
9 3 7 8 /* V -> V */
@@ -52,7 +45,8 @@
13 1 1 8 /* W -> W */
14 1 6 8 /* E -> E */
15 2 1 8 /* R -> R */
-16 1 4 8 /* Z -> Z */
+
+16 3 1 8 /* Z -> Y */
17 2 6 8 /* T -> T */
18 7 0 8 /* 1 -> 1 */
19 7 3 8 /* 2 -> 2 */
@@ -68,6 +62,7 @@
29 4 3 8 /* 0 -> 0 */
30 6 1 8 /* Plus -> * */
31 4 6 8 /* O -> O */
+
32 3 6 8 /* U -> U */
33 5 6 8 /* "U -> @ */
34 4 1 8 /* I -> I */
@@ -84,23 +79,24 @@
45 4 7 8 /* N -> N */
46 4 4 8 /* M -> M */
47 5 4 8 /* . -> . */
+
48 7 2 8 /* TAB -> Ctrl */
49 7 4 8 /* Space -> Space */
-#50 -1 -1 0 /* <> -> (no key) */
+50 7 5 8 /* < > -> CBM */
51 0 0 8 /* Backspace -> Del */
52 6 4 4 /* Enter -> Right Shift */
53 7 7 8 /* ESC -> Run/Stop */
-
-#54 -1 -1 0 /* (no key) */
-#55 -1 -1 0 /* (no key) */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
56 1 7 2 /* Left Shift -> Left Shift */
#57 -1 -1 0 /* (no key) */
-58 7 5 8 /* Option -> CBM */
+58 7 5 8 /* Left Alt -> CBM */
59 7 2 8 /* Left Ctrl -> CBM */
-#60 -1 -1 0 /* (no key) */
-#61 -1 -1 0 /* (no key) */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
#62 -1 -1 0 /* (no key) */
-#63 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
#64 -1 -1 0 /* (no key) */
#65 -1 -1 0 /* Numpad . -> (no key) */
#66 -1 -1 0 /* &&& -> (no key) */
@@ -116,6 +112,7 @@
#76 -1 -1 0 /* Numpad Enter -> (no key) */
#77 -1 -1 0 /* &&& -> (no key) */
#78 -1 -1 0 /* Numpad - -> (no key) */
+
#82 -1 -1 0 /* Numpad 0 -> (no key) */
#83 -1 -1 0 /* Numpad 1 -> (no key) */
#84 -1 -1 0 /* Numpad 2 -> (no key) */
@@ -126,53 +123,25 @@
#89 -1 -1 0 /* Numpad 7 -> (no key) */
#91 -1 -1 0 /* Numpad 8 -> (no key) */
#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
96 0 6 8 /* F5 -> F5 */
97 0 6 1 /* F6 -> F6 */
98 0 3 8 /* F7 -> F7 */
99 0 5 8 /* F3 -> F3 */
100 0 3 1 /* F8 -> F8 */
-#101 -1 -1 0 /* F9 -> (no key) */
-#103 -1 -1 0 /* F11 -> (no key) */
-#109 -1 -1 0 /* F10 -> (no key) */
-#111 -1 -1 0 /* F12 -> (no key) */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
115 6 3 8 /* Home -> CLR/HOME */
116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
118 0 5 1 /* F4 -> F4 */
120 0 4 1 /* F2 -> F2 */
121 6 0 8 /* PgDown -> Pound */
122 0 4 8 /* F1 -> F1 */
123 0 2 1 /* Left -> CRSR LEFT */
-124 0 2 8 /* Right -> CRSR RIGHT */
-125 0 7 8 /* Down -> CRSR DOWN */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
126 0 7 1 /* Up -> CRSR UP */
-
-#
-# Joystick 1
-#
-#KP_0 -1 0
-#KP_1 -1 1
-#KP_2 -1 2
-#KP_3 -1 3
-#KP_4 -1 4
-#KP_5 -1 5
-#KP_6 -1 6
-#KP_7 -1 7
-#KP_8 -1 8
-#KP_9 -1 9
-
-#
-# Joystick 2
-#
-#w -2 7
-#e -2 8
-#r -2 9
-#s -2 4
-#d -2 5
-#f -2 6
-#x -2 1
-#c -2 2
-#v -2 3
-#space -2 0
-
-# Restore key mappings
-117 -3 0 /* Del -> RESTORE */
Modified: branches/marco/ports/vice/data/C64/osx_sym.vkm
===================================================================
--- branches/marco/ports/vice/data/C64/osx_sym.vkm 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/data/C64/osx_sym.vkm 2008-05-25 23:14:26 UTC (rev 18811)
@@ -1,183 +0,0 @@
-# VICE keyboard mapping file
-#
-# A Keyboard map is read in as patch to the current map.
-#
-# File format:
-# - comment lines start with '#'
-# - keyword lines start with '!keyword'
-# - normal line has 'keysym/scancode row column shiftflag'
-#
-# Keywords and their lines are:
-# '!CLEAR' clear whole table
-# '!INCLUDE filename' read file as mapping file
-# '!LSHIFT row col' left shift keyboard row/column
-# '!RSHIFT row col' right shift keyboard row/column
-# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
-# '!UNDEF keysym' remove keysym from table
-#
-# Shiftflag can have the values:
-# 0 key is not shifted for this keysym
-# 1 key is shifted for this keysym
-# 2 left shift
-# 4 right shift
-# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
-
-!CLEAR
-!LSHIFT 1 7
-!RSHIFT 6 4
-!VSHIFT RSHIFT
-
-0 1 2 8 /* A -> A */
-1 1 5 8 /* S -> S */
-2 2 2 8 /* D -> D */
-3 2 5 8 /* F -> F */
-4 3 5 8 /* H -> H */
-5 3 2 8 /* G -> G */
-6 3 1 8 /* Y -> Y */
-7 2 7 8 /* X -> X */
-8 2 4 8 /* C -> C */
-9 3 7 8 /* V -> V */
-10 7 1 8 /* ^ -> Left Arrow */
-11 3 4 8 /* B -> B */
-12 7 6 8 /* Q -> Q */
-13 1 1 8 /* W -> W */
-14 1 6 8 /* E -> E */
-15 2 1 8 /* R -> R */
-16 1 4 8 /* Z -> Z */
-17 2 6 8 /* T -> T */
-18 7 0 8 /* 1 -> 1 */
-19 7 3 8 /* 2 -> 2 */
-20 1 0 8 /* 3 -> 3 */
-21 1 3 8 /* 4 -> 4 */
-22 2 3 8 /* 6 -> 6 */
-23 2 0 8 /* 5 -> 5 */
-24 5 3 8 /* ` -> Minus */
-25 4 0 8 /* 9 -> 9 */
-26 3 0 8 /* 7 -> 7 */
-27 5 0 8 /* \ss -> Plus */
-28 3 3 8 /* 8 -> 8 */
-29 4 3 8 /* 0 -> 0 */
-30 6 1 8 /* Plus -> * */
-31 4 6 8 /* O -> O */
-32 3 6 8 /* U -> U */
-33 5 6 8 /* "U -> @ */
-34 4 1 8 /* I -> I */
-35 5 1 8 /* P -> P */
-36 0 1 8 /* Return -> Return */
-37 5 2 8 /* L -> L */
-38 4 2 8 /* J -> J */
-39 6 2 8 /* "A -> ; */
-40 4 5 8 /* K -> K */
-41 5 5 8 /* "O -> : */
-42 6 5 8 /* Hash -> = */
-43 5 7 8 /* , -> , */
-44 6 7 8 /* Minus -> / */
-45 4 7 8 /* N -> N */
-46 4 4 8 /* M -> M */
-47 5 4 8 /* . -> . */
-48 7 2 8 /* TAB -> Ctrl */
-49 7 4 8 /* Space -> Space */
-#50 -1 -1 0 /* <> -> (no key) */
-51 0 0 8 /* Backspace -> Del */
-52 6 4 4 /* Enter -> Right Shift */
-53 7 7 8 /* ESC -> Run/Stop */
-
-#54 -1 -1 0 /* (no key) */
-#55 -1 -1 0 /* (no key) */
-56 1 7 2 /* Left Shift -> Left Shift */
-#57 -1 -1 0 /* (no key) */
-58 7 5 8 /* Option -> CBM */
-59 7 2 8 /* Left Ctrl -> CBM */
-#60 -1 -1 0 /* (no key) */
-#61 -1 -1 0 /* (no key) */
-#62 -1 -1 0 /* (no key) */
-#63 -1 -1 0 /* (no key) */
-#64 -1 -1 0 /* (no key) */
-#65 -1 -1 0 /* Numpad . -> (no key) */
-#66 -1 -1 0 /* &&& -> (no key) */
-#67 -1 -1 0 /* Numpad * -> (no key) */
-#68 -1 -1 0 /* (no key) */
-#69 -1 -1 0 /* Numpad + -> (no key) */
-#70 -1 -1 0 /* &&& -> (no key) */
-#71 -1 -1 0 /* Numpad Clear -> (no key) */
-#72 -1 -1 0 /* &&& -> (no key) */
-#73 -1 -1 0 /* &&& -> (no key) */
-#74 -1 -1 0 /* &&& -> (no key) */
-#75 -1 -1 0 /* Numpad / -> (no key) */
-#76 -1 -1 0 /* Numpad Enter -> (no key) */
-#77 -1 -1 0 /* &&& -> (no key) */
-#78 -1 -1 0 /* Numpad - -> (no key) */
-#82 -1 -1 0 /* Numpad 0 -> (no key) */
-#83 -1 -1 0 /* Numpad 1 -> (no key) */
-#84 -1 -1 0 /* Numpad 2 -> (no key) */
-#85 -1 -1 0 /* Numpad 3 -> (no key) */
-#86 -1 -1 0 /* Numpad 4 -> (no key) */
-#87 -1 -1 0 /* Numpad 5 -> (no key) */
-#88 -1 -1 0 /* Numpad 6 -> (no key) */
-#89 -1 -1 0 /* Numpad 7 -> (no key) */
-#91 -1 -1 0 /* Numpad 8 -> (no key) */
-#92 -1 -1 0 /* Numpad 9 -> (no key) */
-96 0 6 8 /* F5 -> F5 */
-97 0 6 1 /* F6 -> F6 */
-98 0 3 8 /* F7 -> F7 */
-99 0 5 8 /* F3 -> F3 */
-100 0 3 1 /* F8 -> F8 */
-#101 -1 -1 0 /* F9 -> (no key) */
-#103 -1 -1 0 /* F11 -> (no key) */
-#109 -1 -1 0 /* F10 -> (no key) */
-#111 -1 -1 0 /* F12 -> (no key) */
-115 6 3 8 /* Home -> CLR/HOME */
-116 6 6 8 /* PgUp -> Up Arrow */
-118 0 5 1 /* F4 -> F4 */
-120 0 4 1 /* F2 -> F2 */
-121 6 0 8 /* PgDown -> Pound */
-122 0 4 8 /* F1 -> F1 */
-123 0 2 1 /* Left -> CRSR LEFT */
-124 0 2 8 /* Right -> CRSR RIGHT */
-125 0 7 8 /* Down -> CRSR DOWN */
-126 0 7 1 /* Up -> CRSR UP */
-
-#
-# Joystick 1
-#
-#KP_0 -1 0
-#KP_1 -1 1
-#KP_2 -1 2
-#KP_3 -1 3
-#KP_4 -1 4
-#KP_5 -1 5
-#KP_6 -1 6
-#KP_7 -1 7
-#KP_8 -1 8
-#KP_9 -1 9
-
-123 -2 4 /* Left -> Joy2 LEFT */
-124 -2 6 /* Right -> Joy2 RIGHT */
-125 -2 2 /* Down -> Joy2 DOWN */
-126 -2 8 /* Up -> Joy2 UP */
-52 -2 0 /* Enter -> Joy2 BUTTON */
-#
-# Joystick 2
-#
-#w -2 7
-#e -2 8
-#r -2 9
-#s -2 4
-#d -2 5
-#f -2 6
-#x -2 1
-#c -2 2
-#v -2 3
-#space -2 0
-
-# Restore key mappings
-117 -3 0 /* Del -> RESTORE */
Modified: branches/marco/ports/vice/depcomp
===================================================================
--- branches/marco/ports/vice/depcomp 2008-05-25 19:08:03 UTC (rev 18810)
+++ branches/marco/ports/vice/depcomp 2008-05-25 23:14:26 UTC (rev 18811)
@@ -1,530 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2005-07-09.11
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-# 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, 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <ol...@dc...>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
- depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
- DEPDIR directory where to store dependencies.
- depfile Dependency file to output.
- tmpdepfile Temporary file to use when outputing dependencies.
- libtool Whether libtool is used (yes/no).
-
-Report bugs to <bug...@gn...>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "depcomp $scriptversion"
- exit $?
- ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
- exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags. We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write. Note that we *cannot* use a case
-# here, be...
[truncated message content] |
|
From: <st...@us...> - 2008-05-25 19:07:59
|
Revision: 18810
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18810&view=rev
Author: strik
Date: 2008-05-25 12:08:03 -0700 (Sun, 25 May 2008)
Log Message:
-----------
Tagged v1.22.16.
Added Paths:
-----------
tags/v1.22/v1.22.16/
Copied: tags/v1.22/v1.22.16 (from rev 18809, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-05-25 19:04:55
|
Revision: 18809
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18809&view=rev
Author: strik
Date: 2008-05-25 12:05:02 -0700 (Sun, 25 May 2008)
Log Message:
-----------
2008-05-25 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.16.
Modified Paths:
--------------
trunk/vice/ChangeLog
trunk/vice/configure.in
trunk/vice/po/de.po
trunk/vice/po/fr.po
trunk/vice/po/hu.po
trunk/vice/po/it.po
trunk/vice/po/nl.po
trunk/vice/po/pl.po
trunk/vice/po/sv.po
trunk/vice/src/ChangeLog
trunk/vice/src/version.h
Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog 2008-05-25 18:59:05 UTC (rev 18808)
+++ trunk/vice/ChangeLog 2008-05-25 19:05:02 UTC (rev 18809)
@@ -1,3 +1,7 @@
+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
Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in 2008-05-25 18:59:05 UTC (rev 18808)
+++ trunk/vice/configure.in 2008-05-25 19:05:02 UTC (rev 18809)
@@ -9,7 +9,7 @@
VICE_VERSION_MAJOR=1
VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=15
+VICE_VERSION_BUILD=16
AC_SUBST(VICE_VERSION_MAJOR)
AC_SUBST(VICE_VERSION_MINOR)
Modified: trunk/vice/po/de.po
===================================================================
--- trunk/vice/po/de.po 2008-05-25 18:59:05 UTC (rev 18808)
+++ trunk/vice/po/de.po 2008-05-25 19:05:02 UTC (rev 18809)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-07 19:29+0200\n"
+"POT-Creation-Date: 2008-05-25 21:02+0200\n"
"PO-Revision-Date: 2008-01-02 16:46+0100\n"
"Last-Translator: Martin Pottendorfer (pot...@ut...)\n"
"Language-Team: de <de...@li...>\n"
@@ -19,7 +19,7 @@
msgid "<percent>"
msgstr "<prozent>"
-#: src/vsync.c:147 src/translate.c.po.c:4605
+#: src/vsync.c:147 src/translate.c.po.c:4615
msgid "Limit emulation speed to specified value"
msgstr "Emulationsgeschwindigkeit auf Wert beschr\xE4nken."
@@ -31,15 +31,15 @@
msgid "<value>"
msgstr "<Wert>"
-#: src/vsync.c:149 src/translate.c.po.c:4615
+#: src/vsync.c:149 src/translate.c.po.c:4625
msgid "Update every <value> frames (`0' for automatic)"
msgstr "Jedes <Wert> Bild aktualisieren (`0' f\xFCr Automatik)"
-#: src/vsync.c:151 src/translate.c.po.c:4625
+#: src/vsync.c:151 src/translate.c.po.c:4635
msgid "Enable warp mode"
msgstr "Warp Mode aktivieren"
-#: src/vsync.c:153 src/translate.c.po.c:4635
+#: src/vsync.c:153 src/translate.c.po.c:4645
msgid "Disable warp mode"
msgstr "Warp Mode deaktivieren"
@@ -56,19 +56,19 @@
msgid "Cannot load snapshot file."
msgstr "Kann Snapshot Datei nicht laden."
-#: src/sound.c:271 src/translate.c.po.c:4455
+#: src/sound.c:271 src/translate.c.po.c:4465
msgid "Enable sound playback"
msgstr "Sound Wiedergaben einschalten"
-#: src/sound.c:273 src/translate.c.po.c:4465
+#: src/sound.c:273 src/translate.c.po.c:4475
msgid "Disable sound playback"
msgstr "Sound Wiedergaben ausschalten"
-#: src/sound.c:275 src/translate.c.po.c:4475
+#: src/sound.c:275 src/translate.c.po.c:4485
msgid "Set sound sample rate to <value> Hz"
msgstr "Setze Sound Sample Rate zu <Wert> Hz"
-#: src/sound.c:277 src/translate.c.po.c:4485
+#: src/sound.c:277 src/translate.c.po.c:4495
msgid "Set sound buffer size to <value> msec"
msgstr "Setze Source Buffer Gr\xF6\xDFe zu <Wert> msek"
@@ -85,13 +85,13 @@
#: src/c64/c64-cmdline-options.c:91 src/c64/c64-cmdline-options.c:93
#: src/c64/c64-cmdline-options.c:95 src/c64/c64-cmdline-options.c:112
#: src/c64/c64-cmdline-options.c:114 src/c64/c64-cmdline-options.c:116
-#: src/c64/cart/c64cart.c:235 src/c64/cart/c64cart.c:238
-#: src/c64/cart/c64cart.c:241 src/c64/cart/c64cart.c:244
-#: src/c64/cart/c64cart.c:247 src/c64/cart/c64cart.c:250
-#: src/c64/cart/c64cart.c:253 src/c64/cart/c64cart.c:256
-#: src/c64/cart/c64cart.c:259 src/c64/cart/c64cart.c:262
-#: src/c64/cart/c64cart.c:265 src/c64/cart/c64cart.c:268
-#: src/c64/cart/c64cart.c:271 src/c64/cart/c64cart.c:274
+#: src/c64/cart/c64cart.c:236 src/c64/cart/c64cart.c:239
+#: src/c64/cart/c64cart.c:242 src/c64/cart/c64cart.c:245
+#: src/c64/cart/c64cart.c:248 src/c64/cart/c64cart.c:251
+#: src/c64/cart/c64cart.c:254 src/c64/cart/c64cart.c:257
+#: src/c64/cart/c64cart.c:260 src/c64/cart/c64cart.c:263
+#: src/c64/cart/c64cart.c:266 src/c64/cart/c64cart.c:269
+#: src/c64/cart/c64cart.c:272 src/c64/cart/c64cart.c:275
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:209
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:247
@@ -142,38 +142,38 @@
#: src/rs232drv/rs232drv.c:105 src/rs232drv/rs232drv.c:107
#: src/vic20/vic20-cmdline-options.c:209 src/vic20/vic20-cmdline-options.c:211
#: src/vic20/vic20-cmdline-options.c:213 src/vic20/vic20-cmdline-options.c:228
-#: src/vic20/vic20-cmdline-options.c:230 src/vic20/vic20cartridge.c:211
-#: src/vic20/vic20cartridge.c:213 src/vic20/vic20cartridge.c:215
-#: src/vic20/vic20cartridge.c:217 src/vic20/vic20cartridge.c:219
+#: src/vic20/vic20-cmdline-options.c:230 src/vic20/vic20cartridge.c:212
+#: src/vic20/vic20cartridge.c:214 src/vic20/vic20cartridge.c:216
+#: src/vic20/vic20cartridge.c:218 src/vic20/vic20cartridge.c:220
#: src/video/video-cmdline-options.c:192 src/translate.c.po.c:654
msgid "<name>"
msgstr "<Name>"
-#: src/sound.c:279 src/translate.c.po.c:4495
+#: src/sound.c:279 src/translate.c.po.c:4505
msgid "Specify sound driver"
msgstr "Sound Treiber spezifieren"
-#: src/sound.c:281 src/sound.c:285 src/translate.c.po.c:4505
+#: src/sound.c:281 src/sound.c:285 src/translate.c.po.c:4515
msgid "<args>"
msgstr "<Argumente>"
-#: src/sound.c:281 src/translate.c.po.c:4515
+#: src/sound.c:281 src/translate.c.po.c:4525
msgid "Specify initialization parameters for sound driver"
msgstr "Initialisierungsparameter des Sound Treibers spezifizieren"
-#: src/sound.c:283 src/translate.c.po.c:4525
+#: src/sound.c:283 src/translate.c.po.c:4535
msgid "Specify recording sound driver"
msgstr "Sound Treiber f\xFCr Aufnahme spezifizieren"
-#: src/sound.c:285 src/translate.c.po.c:4535
+#: src/sound.c:285 src/translate.c.po.c:4545
msgid "Specify initialization parameters for recording sound driver"
msgstr "Initialisierungsparameter f\xFCr Aufnahme Sound Treiber spezifieren"
-#: src/sound.c:287 src/translate.c.po.c:4545
+#: src/sound.c:287 src/translate.c.po.c:4555
msgid "<sync>"
msgstr "<Sync>"
-#: src/sound.c:287 src/translate.c.po.c:4555
+#: src/sound.c:287 src/translate.c.po.c:4565
msgid "Set sound speed adjustment (0: flexible, 1: adjusting, 2: exact)"
msgstr ""
"Setze Sound Geschwindigkeit Anpassung (0: flexibel, 1: anpassend, 2: exakt)"
@@ -722,75 +722,75 @@
msgid "Specify name of symbolic German keymap file"
msgstr "Name von symbolischer Keymap Datei definieren"
-#: src/c64/cart/c64cart.c:229 src/translate.c.po.c:1422
+#: src/c64/cart/c64cart.c:230 src/translate.c.po.c:1422
msgid "Reset machine if a cartridge is attached or detached"
msgstr ""
"Reset der Maschine wenn ein Erweiterungsmodul eingelegt oder entfernt wird"
-#: src/c64/cart/c64cart.c:232 src/translate.c.po.c:1432
+#: src/c64/cart/c64cart.c:233 src/translate.c.po.c:1432
msgid "Do not reset machine if a cartridge is attached or detached"
msgstr ""
"Kein Reset der Maschine wenn ein Erweiterungsmodul eingelegt oder entfernt "
"wird"
-#: src/c64/cart/c64cart.c:235 src/arch/win32/res.rc.po.c:4998
+#: src/c64/cart/c64cart.c:236 src/arch/win32/res.rc.po.c:4998
#: src/translate.c.po.c:1442 src/arch/amigaos/intl.c.po.c:2333
msgid "Attach CRT cartridge image"
msgstr "CRT Erweiterungsmodul Image einlegen"
-#: src/c64/cart/c64cart.c:238 src/translate.c.po.c:1452
+#: src/c64/cart/c64cart.c:239 src/translate.c.po.c:1452
msgid "Attach generic 8KB cartridge image"
msgstr "Generisches 8K Erweiterungsmodul Image einlegen"
-#: src/c64/cart/c64cart.c:241 src/translate.c.po.c:1462
+#: src/c64/cart/c64cart.c:242 src/translate.c.po.c:1462
msgid "Attach generic 16KB cartridge image"
msgstr "Generisches 16K Erweiterungsmodul Image einlegen"
-#: src/c64/cart/c64cart.c:244 src/translate.c.po.c:1482
+#: src/c64/cart/c64cart.c:245 src/translate.c.po.c:1482
msgid "Attach raw 32KB Action Replay cartridge image"
msgstr "32K Action Replay Image einlegen"
-#: src/c64/cart/c64cart.c:247 src/translate.c.po.c:1472
+#: src/c64/cart/c64cart.c:248 src/translate.c.po.c:1472
msgid "Attach raw 16KB Action Replay III cartridge image"
msgstr "16KB Action Replay Image III (raw) einlegen"
-#: src/c64/cart/c64cart.c:250 src/translate.c.po.c:1492
+#: src/c64/cart/c64cart.c:251 src/translate.c.po.c:1492
msgid "Attach raw 64KB Retro Replay cartridge image"
msgstr "64K Retro Replay Image einlegen"
-#: src/c64/cart/c64cart.c:253 src/translate.c.po.c:1502
+#: src/c64/cart/c64cart.c:254 src/translate.c.po.c:1502
msgid "Attach raw 64KB IDE64 cartridge image"
msgstr "64KB IDE64 Image einlegen"
-#: src/c64/cart/c64cart.c:256 src/translate.c.po.c:1512
+#: src/c64/cart/c64cart.c:257 src/translate.c.po.c:1512
msgid "Attach raw 32KB Atomic Power cartridge image"
msgstr "32KB Atomic Power Image einlegen"
-#: src/c64/cart/c64cart.c:259 src/translate.c.po.c:1522
+#: src/c64/cart/c64cart.c:260 src/translate.c.po.c:1522
msgid "Attach raw 8KB Epyx fastload cartridge image"
msgstr "8KB Epyx Fastload Image einlegen"
-#: src/c64/cart/c64cart.c:262 src/translate.c.po.c:1532
+#: src/c64/cart/c64cart.c:263 src/translate.c.po.c:1532
msgid "Attach raw 32KB Super Snapshot cartridge image"
msgstr "32KB Super Snapshot (raw) Image einlegen"
-#: src/c64/cart/c64cart.c:265 src/translate.c.po.c:1542
+#: src/c64/cart/c64cart.c:266 src/translate.c.po.c:1542
msgid "Attach raw 64KB Super Snapshot cartridge image"
msgstr "64KB Super Snapshot (raw) Image einlegen"
-#: src/c64/cart/c64cart.c:268 src/translate.c.po.c:1552
+#: src/c64/cart/c64cart.c:269 src/translate.c.po.c:1552
msgid "Attach CBM IEEE488 cartridge image"
msgstr "CBM IEEE488 Erweiterungsmodul einlegen"
-#: src/c64/cart/c64cart.c:271 src/translate.c.po.c:1562
+#: src/c64/cart/c64cart.c:272 src/translate.c.po.c:1562
msgid "Attach raw 16KB Westermann learning cartridge image"
msgstr "16KB Westermann learning (raw) Image einlegen"
-#: src/c64/cart/c64cart.c:274 src/translate.c.po.c:4775
+#: src/c64/cart/c64cart.c:275 src/translate.c.po.c:4785
msgid "Attach raw Structured Basic cartridge image"
msgstr "Erweiterungsmodul Structured Basic (raw) Image einlegen"
-#: src/c64/cart/c64cart.c:277 src/translate.c.po.c:1572
+#: src/c64/cart/c64cart.c:278 src/translate.c.po.c:1572
msgid "Enable expert cartridge"
msgstr "Expert Cartridge aktivieren"
@@ -818,15 +818,15 @@
msgid "Do not autodetect geometry of formatted images"
msgstr "Geometrie von formatierten Image Dateien nicht automatisch erkennen"
-#: src/c64/c64_256k.c:206 src/translate.c.po.c:4735
+#: src/c64/c64_256k.c:206 src/translate.c.po.c:4745
msgid "Enable the 256K RAM expansion"
msgstr "256K RAM Erweiterung aktivieren"
-#: src/c64/c64_256k.c:208 src/translate.c.po.c:4745
+#: src/c64/c64_256k.c:208 src/translate.c.po.c:4755
msgid "Disable the 256K RAM expansion"
msgstr "256K RAM Erweiterung deaktivieren"
-#: src/c64/c64_256k.c:210 src/translate.c.po.c:4755
+#: src/c64/c64_256k.c:210 src/translate.c.po.c:4765
msgid "Specify name of 256K image"
msgstr "Name der 256K Image Datei definieren"
@@ -835,7 +835,7 @@
msgid "<base address>"
msgstr "<Basis Adresse>"
-#: src/c64/c64_256k.c:212 src/translate.c.po.c:4765
+#: src/c64/c64_256k.c:212 src/translate.c.po.c:4775
msgid "Base address of the 256K expansion"
msgstr "Basis Adresse f\xFCr 256K RAM Erweiterung"
@@ -847,15 +847,15 @@
"Digimax kann mit ReSID nicht benutzt werden\n"
"Bitte SID Engine auf FastSID setzen"
-#: src/c64/digimax.c:137 src/translate.c.po.c:4825
+#: src/c64/digimax.c:137 src/translate.c.po.c:4835
msgid "Enable the digimax cartridge"
msgstr "Digimax Cartridge aktivieren"
-#: src/c64/digimax.c:139 src/translate.c.po.c:4835
+#: src/c64/digimax.c:139 src/translate.c.po.c:4845
msgid "Disable the digimax cartridge"
msgstr "Digimax Cartridge deaktivieren"
-#: src/c64/digimax.c:141 src/translate.c.po.c:4845
+#: src/c64/digimax.c:141 src/translate.c.po.c:4855
msgid "Base address of the digimax cartridge"
msgstr "Basis Adresse f\xFCr Digimax Erweiterung"
@@ -908,31 +908,31 @@
msgid "Save the MMC64 bios when changed"
msgstr "MMC64 BIOS speichern bei \xC4nderung"
-#: src/c64/plus256k.c:171 src/translate.c.po.c:4665
+#: src/c64/plus256k.c:171 src/translate.c.po.c:4675
msgid "Enable the PLUS256K RAM expansion"
msgstr "PLUS256K RAM Erweiterung aktivieren"
-#: src/c64/plus256k.c:173 src/translate.c.po.c:4675
+#: src/c64/plus256k.c:173 src/translate.c.po.c:4685
msgid "Disable the PLUS256K RAM expansion"
msgstr "PLUS256K RAM Erweiterung deaktivieren"
-#: src/c64/plus256k.c:175 src/translate.c.po.c:4685
+#: src/c64/plus256k.c:175 src/translate.c.po.c:4695
msgid "Specify name of PLUS256K image"
msgstr "Name der PLUS256K Image Datei definieren"
-#: src/c64/plus60k.c:245 src/translate.c.po.c:4695
+#: src/c64/plus60k.c:245 src/translate.c.po.c:4705
msgid "Enable the PLUS60K RAM expansion"
msgstr "PLUS60K RAM Erweiterung aktivieren"
-#: src/c64/plus60k.c:247 src/translate.c.po.c:4705
+#: src/c64/plus60k.c:247 src/translate.c.po.c:4715
msgid "Disable the PLUS60K RAM expansion"
msgstr "PLUS60K RAM Erweiterung deaktivieren"
-#: src/c64/plus60k.c:249 src/translate.c.po.c:4715
+#: src/c64/plus60k.c:249 src/translate.c.po.c:4725
msgid "Specify name of PLUS60K image"
msgstr "Name der PLUS60K Image Datei definieren"
-#: src/c64/plus60k.c:251 src/translate.c.po.c:4725
+#: src/c64/plus60k.c:251 src/translate.c.po.c:4735
msgid "Base address of the PLUS60K expansion"
msgstr "Basis Adresse f\xFCr PLUS60K Erweiterung"
@@ -1285,7 +1285,7 @@
msgid "Specify name of 1551 DOS ROM image"
msgstr "Name der 1551 DOS ROM Datei definieren"
-#: src/fliplist.c:121 src/translate.c.po.c:4194
+#: src/fliplist.c:121 src/translate.c.po.c:4204
msgid "Specify name of the flip list file image"
msgstr "Namen f\xFCr Fliplist Datei definieren"
@@ -1327,87 +1327,87 @@
msgstr "ffmpegdrv: \xD6ffnen von %s fehlgeschlagen"
#: src/initcmdline.c:155 src/initcmdline.c:157 src/initcmdline.c:159
-#: src/translate.c.po.c:4203
+#: src/translate.c.po.c:4213
msgid "Show a list of the available options and exit normally"
msgstr "Liste von verf\xFCgbaren Optionen zeigen und beenden"
-#: src/initcmdline.c:162 src/translate.c.po.c:4214
+#: src/initcmdline.c:162 src/translate.c.po.c:4224
msgid "Console mode (for music playback)"
msgstr "Konsolenmodus (f\xFCr Musikwiedergabe)"
-#: src/initcmdline.c:164 src/translate.c.po.c:4224
+#: src/initcmdline.c:164 src/translate.c.po.c:4234
msgid "Allow production of core dumps"
msgstr "Core Dumps erm\xF6glichen"
-#: src/initcmdline.c:166 src/translate.c.po.c:4234
+#: src/initcmdline.c:166 src/translate.c.po.c:4244
msgid "Do not produce core dumps"
msgstr "Core Dumps verhindern"
-#: src/initcmdline.c:169 src/translate.c.po.c:4244
+#: src/initcmdline.c:169 src/translate.c.po.c:4254
msgid "Don't call exception handler"
msgstr "Ausnahmebehandlung vermeiden"
-#: src/initcmdline.c:171 src/translate.c.po.c:4254
+#: src/initcmdline.c:171 src/translate.c.po.c:4264
msgid "Call exception handler (default)"
msgstr "Ausnahmebehandlung aktivieren (Default)"
-#: src/initcmdline.c:206 src/translate.c.po.c:4265
+#: src/initcmdline.c:206 src/translate.c.po.c:4275
msgid "Restore default (factory) settings"
msgstr "Wiederherstellen Standard Einstellungen"
-#: src/initcmdline.c:208 src/translate.c.po.c:4275
+#: src/initcmdline.c:208 src/translate.c.po.c:4285
msgid "Attach and autostart tape/disk image <name>"
msgstr "Einlegen und Autostart Disk/Band Image Datei <Name>"
-#: src/initcmdline.c:210 src/translate.c.po.c:4285
+#: src/initcmdline.c:210 src/translate.c.po.c:4295
msgid "Attach and autoload tape/disk image <name>"
msgstr "Einlegen und Autoload Disk/Band Image Datei <Name>"
-#: src/initcmdline.c:212 src/translate.c.po.c:4295
+#: src/initcmdline.c:212 src/translate.c.po.c:4305
msgid "Attach <name> as a tape image"
msgstr "Image Datei <Name> einlegen"
-#: src/initcmdline.c:214 src/translate.c.po.c:4305
+#: src/initcmdline.c:214 src/translate.c.po.c:4315
msgid "Attach <name> as a disk image in drive #8"
msgstr "Image Datei <Name> im Laufwerk #8 einlegen"
-#: src/initcmdline.c:216 src/translate.c.po.c:4315
+#: src/initcmdline.c:216 src/translate.c.po.c:4325
msgid "Attach <name> as a disk image in drive #9"
msgstr "Image Datei <Name> im Laufwerk #9 einlegen"
-#: src/initcmdline.c:218 src/translate.c.po.c:4325
+#: src/initcmdline.c:218 src/translate.c.po.c:4335
msgid "Attach <name> as a disk image in drive #10"
msgstr "Image Datei <Name> im Laufwerk #10 einlegen"
-#: src/initcmdline.c:220 src/translate.c.po.c:4335
+#: src/initcmdline.c:220 src/translate.c.po.c:4345
msgid "Attach <name> as a disk image in drive #11"
msgstr "Image Datei <Name> im Laufwerk #11 einlegen"
-#: src/kbdbuf.c:136 src/translate.c.po.c:4345
+#: src/kbdbuf.c:136 src/translate.c.po.c:4355
msgid "<string>"
msgstr "<String>"
-#: src/kbdbuf.c:136 src/translate.c.po.c:4355
+#: src/kbdbuf.c:136 src/translate.c.po.c:4365
msgid "Put the specified string into the keyboard buffer"
msgstr "Definierte Eingabe in Tastaturpuffer bereitstellen"
-#: src/log.c:110 src/translate.c.po.c:4365
+#: src/log.c:110 src/translate.c.po.c:4375
msgid "Specify log file name"
msgstr "Logdateiname definieren"
-#: src/mouse.c:358 src/translate.c.po.c:4375
+#: src/mouse.c:358 src/translate.c.po.c:4385
msgid "Enable mouse grab"
msgstr "Maus aktivieren"
-#: src/mouse.c:360 src/translate.c.po.c:4385
+#: src/mouse.c:360 src/translate.c.po.c:4395
msgid "Disable mouse grab"
msgstr "Maus deaktivieren"
-#: src/mouse.c:362 src/translate.c.po.c:4395
+#: src/mouse.c:362 src/translate.c.po.c:4405
msgid "Select the joystick port the mouse is attached to"
msgstr "Joystickport f\xFCr Maus ausw\xE4hlen"
-#: src/mouse.c:364 src/translate.c.po.c:4405
+#: src/mouse.c:364 src/translate.c.po.c:4415
msgid "Select the mouse type (0 = 1351, 1 = NEOS, 2 = Amiga)"
msgstr "Maus typ w\xE4hlen (0 = 1351, 1 = NEOS, 2 = Amiga)"
@@ -1531,19 +1531,19 @@
msgid "Specify size of RAM installed in kb (16/32/64)"
msgstr "Gr\xF6\xDFe des emulierten RAM Speichers in kb (16/32/64) spezifizieren"
-#: src/plus4/plus4memcsory256k.c:120 src/translate.c.po.c:4785
+#: src/plus4/plus4memcsory256k.c:120 src/translate.c.po.c:4795
msgid "Enable the CSORY 256K RAM expansion"
msgstr "CSORY 256K RAM Erweiterung aktivieren"
-#: src/plus4/plus4memhannes256k.c:135 src/translate.c.po.c:4795
+#: src/plus4/plus4memhannes256k.c:135 src/translate.c.po.c:4805
msgid "Enable the HANNES 256K RAM expansion"
msgstr "HANNES 256K RAM Erweiterung aktivieren"
-#: src/plus4/plus4memhannes256k.c:137 src/translate.c.po.c:4805
+#: src/plus4/plus4memhannes256k.c:137 src/translate.c.po.c:4815
msgid "Enable the HANNES 1024K RAM expansion"
msgstr "HANNES 1024K RAM Erweiterung aktivieren"
-#: src/plus4/plus4memhannes256k.c:139 src/translate.c.po.c:4815
+#: src/plus4/plus4memhannes256k.c:139 src/translate.c.po.c:4825
msgid "Enable the HANNES 4096K RAM expansion"
msgstr "HANNES 4096K RAM Erweiterung aktivieren"
@@ -1624,19 +1624,19 @@
msgid "Specify printer text output device for userport printer"
msgstr "IEC Userport Drucker Ger\xE4t f\xFCr Textausgabe definieren"
-#: src/ram.c:101 src/translate.c.po.c:4415
+#: src/ram.c:101 src/translate.c.po.c:4425
msgid "Set the value for the very first RAM address after powerup"
msgstr "Wert f\xFCr erstes Byte im RAM nach Kaltstart setzen"
-#: src/ram.c:104 src/ram.c:107 src/translate.c.po.c:4425
+#: src/ram.c:104 src/ram.c:107 src/translate.c.po.c:4435
msgid "<num of bytes>"
msgstr "<Anzahl an Bytes>"
-#: src/ram.c:104 src/translate.c.po.c:4435
+#: src/ram.c:104 src/translate.c.po.c:4445
msgid "Length of memory block initialized with the same value"
msgstr "L\xE4nge des Speicherblocks der mit dem gleichen Wert initialisiert ist"
-#: src/ram.c:107 src/translate.c.po.c:4445
+#: src/ram.c:107 src/translate.c.po.c:4455
msgid "Length of memory block initialized with the same pattern"
msgstr "L\xE4nge des Speicherblocks der mit dem gleichen Muster initialisiert ist"
@@ -1858,19 +1858,19 @@
msgid "Do not emulate SID filters"
msgstr "SID Filter Emulation deaktivieren"
-#: src/sysfile.c:127 src/translate.c.po.c:4565
+#: src/sysfile.c:127 src/translate.c.po.c:4575
msgid "<path>"
msgstr "<Pfad>"
-#: src/sysfile.c:127 src/translate.c.po.c:4575
+#: src/sysfile.c:127 src/translate.c.po.c:4585
msgid "Define search path to locate system files"
msgstr "Suchpfad f\xFCr Systemdateien definieren"
-#: src/traps.c:123 src/translate.c.po.c:4585
+#: src/traps.c:123 src/translate.c.po.c:4595
msgid "Enable general mechanisms for fast disk/tape emulation"
msgstr "Allgemeine Mechanismen f\xFCr schnelle Disk/Band Emulation aktivieren"
-#: src/traps.c:126 src/translate.c.po.c:4595
+#: src/traps.c:126 src/translate.c.po.c:4605
msgid "Disable general mechanisms for fast disk/tape emulation"
msgstr "Allgemeine Mechanismen f\xFCr schnelle Disk/Band Emulation deaktivieren"
@@ -1902,23 +1902,23 @@
msgid "Disable VIC-1112 IEEE488 interface"
msgstr "VIC-1112 IEEE488 Schnittstelle deaktivieren"
-#: src/vic20/vic20cartridge.c:211 src/translate.c.po.c:3558
+#: src/vic20/vic20cartridge.c:212 src/translate.c.po.c:3558
msgid "Specify 4/8/16K extension ROM name at $2000"
msgstr "4/8/16K Erweiterungs ROM Datei Name f\xFCr $2000 definieren"
-#: src/vic20/vic20cartridge.c:213 src/translate.c.po.c:3568
+#: src/vic20/vic20cartridge.c:214 src/translate.c.po.c:3568
msgid "Specify 4/8/16K extension ROM name at $4000"
msgstr "4/8/16K Erweiterungs ROM Datei Name f\xFCr $4000 definieren"
-#: src/vic20/vic20cartridge.c:215 src/translate.c.po.c:3578
+#: src/vic20/vic20cartridge.c:216 src/translate.c.po.c:3578
msgid "Specify 4/8/16K extension ROM name at $6000"
msgstr "4/8/16K Erweiterungs ROM Datei Name f\xFCr $6000 definieren"
-#: src/vic20/vic20cartridge.c:217 src/translate.c.po.c:3588
+#: src/vic20/vic20cartridge.c:218 src/translate.c.po.c:3588
msgid "Specify 4/8K extension ROM name at $A000"
msgstr "4/8/16K Erweiterungs ROM Datei Name f\xFCr $A000 definieren"
-#: src/vic20/vic20cartridge.c:219 src/translate.c.po.c:3598
+#: src/vic20/vic20cartridge.c:220 src/translate.c.po.c:3598
msgid "Specify 4K extension ROM name at $B000"
msgstr "4/8/16K Erweiterungs ROM Datei Name f\xFCr $B000 definieren"
@@ -2182,13 +2182,13 @@
#: src/arch/unix/gui/c128ui.c:71 src/arch/unix/gui/c64ui.c:74
#: src/arch/unix/gui/cbm2ui.c:64 src/arch/unix/gui/uited.c:56
-#: src/arch/unix/gui/uivic.c:45 src/arch/unix/gui/vsidui.c:286
+#: src/arch/unix/gui/uivic.c:45 src/arch/unix/gui/vsidui.c:290
msgid "*PAL-G"
msgstr "*PAL-G"
#: src/arch/unix/gui/c128ui.c:73 src/arch/unix/gui/c64ui.c:76
#: src/arch/unix/gui/cbm2ui.c:66 src/arch/unix/gui/uited.c:58
-#: src/arch/unix/gui/uivic.c:47 src/arch/unix/gui/vsidui.c:288
+#: src/arch/unix/gui/uivic.c:47 src/arch/unix/gui/vsidui.c:292
msgid "*NTSC-M"
msgstr "*NTSC-M"
@@ -2196,21 +2196,21 @@
#: src/arch/unix/gui/c64ui.c:225 src/arch/unix/gui/c64ui.c:250
#: src/arch/unix/gui/cbm2ui.c:293 src/arch/unix/gui/cbm2ui.c:318
#: src/arch/unix/gui/petui.c:119 src/arch/unix/gui/plus4ui.c:106
-#: src/arch/unix/gui/vic20ui.c:142 src/arch/unix/gui/vsidui.c:198
+#: src/arch/unix/gui/vic20ui.c:142 src/arch/unix/gui/vsidui.c:202
msgid "SID engine"
msgstr "SID Engine"
#: src/arch/unix/gui/c128ui.c:157 src/arch/unix/gui/c128ui.c:183
#: src/arch/unix/gui/c64ui.c:228 src/arch/unix/gui/c64ui.c:254
#: src/arch/unix/gui/cbm2ui.c:296 src/arch/unix/gui/cbm2ui.c:322
-#: src/arch/unix/gui/vsidui.c:201
+#: src/arch/unix/gui/vsidui.c:205
msgid "*Second SID"
msgstr "*Zweiter SID"
#: src/arch/unix/gui/c128ui.c:159 src/arch/unix/gui/c128ui.c:185
#: src/arch/unix/gui/c64ui.c:230 src/arch/unix/gui/c64ui.c:256
#: src/arch/unix/gui/cbm2ui.c:298 src/arch/unix/gui/cbm2ui.c:324
-#: src/arch/unix/gui/vsidui.c:203
+#: src/arch/unix/gui/vsidui.c:207
msgid "*Second SID base address"
msgstr "*Zweiter SID Chip, Basisadresse auf $DE00"
@@ -2218,7 +2218,7 @@
#: src/arch/unix/gui/c64ui.c:233 src/arch/unix/gui/c64ui.c:258
#: src/arch/unix/gui/cbm2ui.c:301 src/arch/unix/gui/cbm2ui.c:327
#: src/arch/unix/gui/petui.c:123 src/arch/unix/gui/plus4ui.c:110
-#: src/arch/unix/gui/vic20ui.c:146 src/arch/unix/gui/vsidui.c:206
+#: src/arch/unix/gui/vic20ui.c:146 src/arch/unix/gui/vsidui.c:210
msgid "*Emulate filters"
msgstr "*Filter Emulation"
@@ -2226,17 +2226,17 @@
#: src/arch/unix/gui/c64ui.c:235 src/arch/unix/gui/c64ui.c:260
#: src/arch/unix/gui/cbm2ui.c:303 src/arch/unix/gui/cbm2ui.c:329
#: src/arch/unix/gui/petui.c:121 src/arch/unix/gui/plus4ui.c:108
-#: src/arch/unix/gui/vic20ui.c:144 src/arch/unix/gui/vsidui.c:208
+#: src/arch/unix/gui/vic20ui.c:144 src/arch/unix/gui/vsidui.c:212
msgid "Chip model"
msgstr "Chip Modell"
#: src/arch/unix/gui/c128ui.c:168 src/arch/unix/gui/c64ui.c:239
-#: src/arch/unix/gui/cbm2ui.c:307 src/arch/unix/gui/vsidui.c:212
+#: src/arch/unix/gui/cbm2ui.c:307 src/arch/unix/gui/vsidui.c:216
msgid "reSID sampling method"
msgstr "reSID Sampling Methode"
#: src/arch/unix/gui/c128ui.c:170 src/arch/unix/gui/c64ui.c:241
-#: src/arch/unix/gui/cbm2ui.c:309 src/arch/unix/gui/vsidui.c:214
+#: src/arch/unix/gui/cbm2ui.c:309 src/arch/unix/gui/vsidui.c:218
msgid "reSID resampling passband..."
msgstr "reSID resampling Passband"
@@ -2412,7 +2412,7 @@
msgstr "VDC Einstellungen"
#: src/arch/unix/gui/c128ui.c:380 src/arch/unix/gui/c64ui.c:366
-#: src/arch/unix/gui/cbm2ui.c:360 src/arch/unix/gui/vsidui.c:336
+#: src/arch/unix/gui/cbm2ui.c:360 src/arch/unix/gui/vsidui.c:340
#: src/arch/win32/ressid.rc.po.c:59
msgid "SID settings"
msgstr "SID Einstellungen"
@@ -2434,7 +2434,7 @@
#: src/arch/unix/gui/c128ui.c:510 src/arch/unix/gui/c64ui.c:494
#: src/arch/unix/gui/cbm2ui.c:505 src/arch/unix/gui/petui.c:487
#: src/arch/unix/gui/plus4ui.c:314 src/arch/unix/gui/vic20ui.c:603
-#: src/arch/unix/gui/vsidui.c:393 src/arch/amigaos/intl.c.po.c:96
+#: src/arch/unix/gui/vsidui.c:397 src/arch/amigaos/intl.c.po.c:96
msgid "File"
msgstr "Datei"
@@ -2455,7 +2455,7 @@
#: src/arch/unix/gui/c128ui.c:516 src/arch/unix/gui/c64ui.c:500
#: src/arch/unix/gui/cbm2ui.c:511 src/arch/unix/gui/petui.c:493
#: src/arch/unix/gui/plus4ui.c:320 src/arch/unix/gui/vic20ui.c:609
-#: src/arch/unix/gui/vsidui.c:395 src/arch/unix/x11/gnome/uinetplay.c:66
+#: src/arch/unix/gui/vsidui.c:399 src/arch/unix/x11/gnome/uinetplay.c:66
#: src/arch/win32/res.rc.po.c:4434 src/arch/amigaos/intl.c.po.c:1221
msgid "Settings"
msgstr "Einstellungen"
@@ -2468,7 +2468,7 @@
msgid "RJHelp"
msgstr "RJHilfe"
-#: src/arch/unix/gui/c64ui.c:78 src/arch/unix/gui/vsidui.c:290
+#: src/arch/unix/gui/c64ui.c:78 src/arch/unix/gui/vsidui.c:294
msgid "*Old NTSC-M"
msgstr "*NTSC-M alt"
@@ -3265,7 +3265,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:171
+#: src/arch/unix/x11/gnome/uipalcontrol.c:173
#: src/arch/unix/x11/gnome/x11ui.c:1822 src/arch/amigaos/intl.c.po.c:312
msgid "Reset"
msgstr "Reset"
@@ -4964,7 +4964,7 @@
msgid "Oversample"
msgstr "Oversample"
-#: src/arch/unix/gui/uisound.c:154 src/arch/unix/gui/vsidui.c:326
+#: src/arch/unix/gui/uisound.c:154 src/arch/unix/gui/vsidui.c:330
msgid "Sound settings"
msgstr "Sound Einstellungen"
@@ -4990,7 +4990,7 @@
msgstr "PAL Emulation"
#: src/arch/unix/gui/uited.c:116 src/arch/unix/gui/uivic.c:111
-#: src/arch/unix/gui/uivicii.c:138 src/arch/unix/gui/vsidui.c:338
+#: src/arch/unix/gui/uivicii.c:138 src/arch/unix/gui/vsidui.c:342
#: src/arch/amigaos/intl.c.po.c:1149
msgid "Video standard"
msgstr "Video Standard"
@@ -5192,37 +5192,37 @@
msgid "VIC settings"
msgstr "VIC Einstellungen"
-#: src/arch/unix/gui/vsidui.c:229
+#: src/arch/unix/gui/vsidui.c:233
msgid "Tunes"
msgstr "Tunes"
-#: src/arch/unix/gui/vsidui.c:239
+#: src/arch/unix/gui/vsidui.c:243
msgid "Load PSID file"
msgstr "PSID Datei laden"
-#: src/arch/unix/gui/vsidui.c:247
+#: src/arch/unix/gui/vsidui.c:251
#, c-format
msgid "`%s' is not a valid PSID file."
msgstr "`%s' ist keine g\xFCltige PSID Datei."
-#: src/arch/unix/gui/vsidui.c:274
+#: src/arch/unix/gui/vsidui.c:278
msgid "Load PSID file..."
msgstr "PSID Datei laden..."
-#: src/arch/unix/gui/vsidui.c:334
+#: src/arch/unix/gui/vsidui.c:338
msgid "*Override PSID settings"
msgstr "*PSID Einstellungen ignorieren"
-#: src/arch/unix/gui/vsidui.c:413
+#: src/arch/unix/gui/vsidui.c:417
msgid "*Default Tune"
msgstr "*Default Tune"
-#: src/arch/unix/gui/vsidui.c:436
+#: src/arch/unix/gui/vsidui.c:440
#, c-format
msgid "*Tune %d"
msgstr "*Tune %d"
-#: src/arch/unix/gui/vsidui.c:464
+#: src/arch/unix/gui/vsidui.c:468
msgid "VSID: The SID Emulator"
msgstr "VSID: DER SID Emulator"
@@ -5358,15 +5358,15 @@
msgid "Gamma"
msgstr "Gamma"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:127
+#: src/arch/unix/x11/gnome/uipalcontrol.c:129
msgid "PAL Settings"
msgstr "PAL Einstellungen"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:180
+#: src/arch/unix/x11/gnome/uipalcontrol.c:182
msgid "Fast Emulation"
msgstr "Schnelle Emulation"
-#: src/arch/unix/x11/gnome/uipalcontrol.c:187
+#: src/arch/unix/x11/gnome/uipalcontrol.c:189
msgid "Exact Emulation"
msgstr "Exakte Emulation"
@@ -5561,7 +5561,7 @@
"Modell: %s\n"
"IRQ: %s"
-#: src/arch/unix/x11/gnome/uifileentry.c:52
+#: src/arch/unix/x11/gnome/uifileentry.c:53
#: src/arch/unix/x11/gnome/x11ui.c:2496
msgid "all files"
msgstr "Alle Dateien (*.*)"
@@ -5971,96 +5971,96 @@
msgid "VICE Error!"
msgstr "VICE Fehler!"
-#: src/arch/unix/x11/xaw/x11video.c:218
+#: src/arch/unix/x11/xaw/x11video.c:223
msgid "Call `XSync()' after updating the emulation window"
msgstr "`XSync()' nach jeder Aktualisierung des Emulator Fensters aufrufen"
-#: src/arch/unix/x11/xaw/x11video.c:221
+#: src/arch/unix/x11/xaw/x11video.c:226
msgid "Do not call `XSync()' after updating the emulation window"
msgstr ""
"`XSync()' nicht nach jeder Aktualisierung des Emulator Fensters aufrufen"
-#: src/arch/unix/x11/xaw/x11video.c:224
+#: src/arch/unix/x11/xaw/x11video.c:229
msgid "Use shared memory"
msgstr "Benutze Shared Memory !"
-#: src/arch/unix/x11/xaw/x11video.c:227
+#: src/arch/unix/x11/xaw/x11video.c:232
msgid "Never use shared memory (slower)"
msgstr "Shared Memory nicht benutzen (langsamer)"
-#: src/arch/unix/x11/xaw/x11video.c:230
+#: src/arch/unix/x11/xaw/x11video.c:235
msgid "Request YUV FOURCC format"
msgstr "YUV FOURCC Format"
-#: src/arch/unix/x11/xaw/x11video.c:232
+#: src/arch/unix/x11/xaw/x11video.c:237
msgid "Set aspect ratio (0.8 - 1.2)"
msgstr "Seitenverh\xE4ltnis (0.8 - 1.2)"
-#: src/arch/unix/x11/xaw/x11video.c:311
+#: src/arch/unix/x11/xaw/x11video.c:316
msgid "The MITSHM extension is not supported on this display."
msgstr ""
"Die MITSHM X Server Erweiterung ist auf diesem Display nicht unterst\xFCtzt."
-#: src/arch/unix/x11/xaw/x11video.c:315
+#: src/arch/unix/x11/xaw/x11video.c:320
#, c-format
msgid "MITSHM extensions version %d.%d detected."
msgstr "MITSHM X Server Eweiterung in Version %d.%d erkannt."
-#: src/arch/unix/x11/xaw/x11video.c:383
+#: src/arch/unix/x11/xaw/x11video.c:388
msgid "Cannot release shared memory!"
msgstr "Kann Shared Memory nicht freigeben!"
-#: src/arch/unix/x11/xaw/x11video.c:512
+#: src/arch/unix/x11/xaw/x11video.c:517
#, c-format
msgid "Successfully initialized using XVideo (%dx%d %.4s)."
msgstr "XVideo erfolgreich initialisiert (%dx%d %.4s)."
-#: src/arch/unix/x11/xaw/x11video.c:532
+#: src/arch/unix/x11/xaw/x11video.c:537
msgid ""
"Cannot allocate XImage with XShm; falling back to non MITSHM extension mode."
msgstr "Kann XImage with XShm nicht allokieren; MITSHM wird nicht benutzt."
-#: src/arch/unix/x11/xaw/x11video.c:545
+#: src/arch/unix/x11/xaw/x11video.c:550
msgid "Cannot get shared memory; falling back to non MITSHM extension mode."
msgstr "Kann Shared Memory nicht allokieren; MITSHM wird nicht benutzt."
-#: src/arch/unix/x11/xaw/x11video.c:556
+#: src/arch/unix/x11/xaw/x11video.c:561
msgid ""
"Cannot get shared memory address; falling back to non MITSHM extension mode."
msgstr ""
"Kann Shared Memory Adresse nicht feststellen; MITSHM wird nicht benutzt."
-#: src/arch/unix/x11/xaw/x11video.c:571 src/arch/unix/x11/xaw/x11video.c:588
+#: src/arch/unix/x11/xaw/x11video.c:576 src/arch/unix/x11/xaw/x11video.c:593
msgid "Cannot attach shared memory; falling back to non MITSHM extension mode."
msgstr ""
"Cannot attach shared memory; falling back to non MITSHM extension mode."
-#: src/arch/unix/x11/xaw/x11video.c:595
+#: src/arch/unix/x11/xaw/x11video.c:600
msgid "MITSHM initialization succeed.\n"
msgstr "MITSHM erfolgreich initialisiert.\n"
-#: src/arch/unix/x11/xaw/x11video.c:616
+#: src/arch/unix/x11/xaw/x11video.c:621
#, c-format
msgid "Successfully initialized%s shared memory."
msgstr "Video erfolgreich%s Shared Memory initialisiert."
-#: src/arch/unix/x11/xaw/x11video.c:617
+#: src/arch/unix/x11/xaw/x11video.c:622
msgid ", using"
msgstr ", mit"
-#: src/arch/unix/x11/xaw/x11video.c:617
+#: src/arch/unix/x11/xaw/x11video.c:622
msgid " without"
msgstr " ohne"
-#: src/arch/unix/x11/xaw/x11video.c:620
+#: src/arch/unix/x11/xaw/x11video.c:625
msgid "Performance will be poor."
msgstr "Performance wird nicht optimal sein."
-#: src/arch/unix/x11/xaw/x11video.c:623
+#: src/arch/unix/x11/xaw/x11video.c:628
msgid "Successfully initialized without shared memory."
msgstr "Video erfolgreich ohne Shared Memory initialisiert."
-#: src/arch/unix/x11/xaw/x11video.c:693
+#: src/arch/unix/x11/xaw/x11video.c:698
#, fuzzy
msgid "HW scaling not available"
msgstr "Welche Kommandozeilen Parameter sind verf\xFCgber?"
@@ -9883,11 +9883,15 @@
msgid "Execute monitor commands from file"
msgstr ""
-#: src/translate.c.po.c:4645
+#: src/translate.c.po.c:4194
+msgid "Set an initial breakpoint for the monitor"
+msgstr ""
+
+#: src/translate.c.po.c:4655
msgid "<iso language code>"
msgstr "<iso Sprachcode>"
-#: src/translate.c.po.c:4655
+#: src/translate.c.po.c:4665
msgid "Specify the iso code of the language"
msgstr "Iso Sprachcode spezifizieren"
Modified: trunk/vice/po/fr.po
===================================================================
--- trunk/vice/po/fr.po 2008-05-25 18:59:05 UTC (rev 18808)
+++ trunk/vice/po/fr.po 2008-05-25 19:05:02 UTC (rev 18809)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: VICE 1.22\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-07 19:29+0200\n"
+"POT-Creation-Date: 2008-05-25 21:02+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"
@@ -24,7 +24,7 @@
msgid "<percent>"
msgstr "<pourcent>"
-#: src/vsync.c:147 src/translate.c.po.c:4605
+#: src/vsync.c:147 src/translate.c.po.c:4615
msgid "Limit emulation speed to specified value"
msgstr "Limiter la vitesse d'\xE9mulation \xE0 une valeur specifi\xE9e"
@@ -36,15 +36,15 @@
msgid "<value>"
msgstr "<valeur>"
-#: src/vsync.c:149 src/translate.c.po.c:4615
+#: src/vsync.c:149 src/translate.c.po.c:4625
msgid "Update every <value> frames (`0' for automatic)"
msgstr "Mise \xE0 jour toutes les <valeur> images (`0' pour auto.)"
-#: src/vsync.c:151 src/translate.c.po.c:4625
+#: src/vsync.c:151 src/translate.c.po.c:4635
msgid "Enable warp mode"
msgstr "Activer mode turbo"
-#: src/vsync.c:153 src/translate.c.po.c:4635
+#: src/vsync.c:153 src/translate.c.po.c:4645
msgid "Disable warp mode"
msgstr "D\xE9sactiver mode turbo"
@@ -60,19 +60,19 @@
msgid "Cannot load snapshot file."
msgstr "Impossible de charger la sauvegarde."
-#: src/sound.c:271 src/translate.c.po.c:4455
+#: src/sound.c:271 src/translate.c.po.c:4465
msgid "Enable sound playback"
msgstr "Activer le son"
-#: src/sound.c:273 src/translate.c.po.c:4465
+#: src/sound.c:273 src/translate.c.po.c:4475
msgid "Disable sound playback"
msgstr "D\xE9sactiver le son"
-#: src/sound.c:275 src/translate.c.po.c:4475
+#: src/sound.c:275 src/translate.c.po.c:4485
msgid "Set sound sample rate to <value> Hz"
msgstr "R\xE9gler le taux d'\xE9chantillonage \xE0 <valeur> Hz"
-#: src/sound.c:277 src/translate.c.po.c:4485
+#: src/sound.c:277 src/translate.c.po.c:4495
msgid "Set sound buffer size to <value> msec"
msgstr "R\xE9gler la taille du tampon \xE0 <valeur> ms"
@@ -89,13 +89,13 @@
#: src/c64/c64-cmdline-options.c:91 src/c64/c64-cmdline-options.c:93
#: src/c64/c64-cmdline-options.c:95 src/c64/c64-cmdline-options.c:112
#: src/c64/c64-cmdline-options.c:114 src/c64/c64-cmdline-options.c:116
-#: src/c64/cart/c64cart.c:235 src/c64/cart/c64cart.c:238
-#: src/c64/cart/c64cart.c:241 src/c64/cart/c64cart.c:244
-#: src/c64/cart/c64cart.c:247 src/c64/cart/c64cart.c:250
-#: src/c64/cart/c64cart.c:253 src/c64/cart/c64cart.c:256
-#: src/c64/cart/c64cart.c:259 src/c64/cart/c64cart.c:262
-#: src/c64/cart/c64cart.c:265 src/c64/cart/c64cart.c:268
-#: src/c64/cart/c64cart.c:271 src/c64/cart/c64cart.c:274
+#: src/c64/cart/c64cart.c:236 src/c64/cart/c64cart.c:239
+#: src/c64/cart/c64cart.c:242 src/c64/cart/c64cart.c:245
+#: src/c64/cart/c64cart.c:248 src/c64/cart/c64cart.c:251
+#: src/c64/cart/c64cart.c:254 src/c64/cart/c64cart.c:257
+#: src/c64/cart/c64cart.c:260 src/c64/cart/c64cart.c:263
+#: src/c64/cart/c64cart.c:266 src/c64/cart/c64cart.c:269
+#: src/c64/cart/c64cart.c:272 src/c64/cart/c64cart.c:275
#: src/c64/cart/ide64.c:281 src/c64/c64_256k.c:210 src/c64/georam.c:209
#: src/c64/mmc64.c:907 src/c64/mmc64.c:909 src/c64/plus256k.c:175
#: src/c64/plus60k.c:249 src/c64/ramcart.c:239 src/c64/reu.c:247
@@ -146,39 +146,39 @@
#: src/rs232drv/rs232drv.c:105 src/rs232drv/rs232drv.c:107
#: src/vic20/vic20-cmdline-options.c:209 src/vic20/vic20-cmdline-options.c:211
#: src/vic20/vic20-cmdline-options.c:213 src/vic20/vic20-cmdline-options.c:228
-#: src/vic20/vic20-cmdline-options.c:230 src/vic20/vic20cartridge.c:211
-#: src/vic20/vic20cartridge.c:213 src/vic20/vic20cartridge.c:215
-#: src/vic20/vic20cartridge.c:217 src/vic20/vic20cartridge.c:219
+#: src/vic20/vic20-cmdline-options.c:230 src/vic20/vic20cartridge.c:212
+#: src/vic20/vic20cartridge.c:214 src/vic20/vic20cartridge.c:216
+#: src/vic20/vic20cartridge.c:218 src/vic20/vic20cartridge.c:220
#: src/video/video-cmdline-options.c:192 src/translate.c.po.c:654
msgid "<name>"
msgstr "<nom>"
-#: src/sound.c:279 src/translate.c.po.c:4495
+#: src/sound.c:279 src/translate.c.po.c:4505
msgid "Specify sound driver"
msgstr "Sp\xE9cifier le pilote son"
-#: src/sound.c:281 src/sound.c:285 src/translate.c.po.c:4505
+#: src/sound.c:281 src/sound.c:285 src/translate.c.po.c:4515
msgid "<args>"
msgstr "<args>"
-#: src/sound.c:281 src/translate.c.po.c:4515
+#: src/sound.c:281 src/translate.c.po.c:4525
msgid "Specify initialization parameters for sound driver"
msgstr "Sp\xE9cifier les param\xE8tres d'initialisation pour le pilote son"
-#: src/sound.c:283 src/translate.c.po.c:4525
+#: src/sound.c:283 src/translate.c.po.c:4535
msgid "Specify recording sound driver"
msgstr "Sp\xE9cifier le pilote d'enregistrement son"
-#: src/sound.c:285 src/translate.c.po.c:4535
+#: src/sound.c:285 src/translate.c.po.c:4545
msgid "Specify initialization parameters for recording sound driver"
msgstr ""
"Sp\xE9cifier les param\xE8tres d'initialisation pour le pilote d'enregistrement son"
-#: src/sound.c:287 src/translate.c.po.c:4545
+#: src/sound.c:287 src/translate.c.po.c:4555
msgid "<sync>"
msgstr "<sync>"
-#: src/sound.c:287 src/translate.c.po.c:4555
+#: src/sound.c:287 src/translate.c.po.c:4565
msgid "Set sound speed adjustment (0: flexible, 1: adjusting, 2: exact)"
msgstr "R\xE9gler l'ajustement son (0: flexible, 1: ajust\xE9 2: exact"
@@ -750,74 +750,74 @@
msgid "Specify name of symbolic German keymap file"
msgstr "Sp\xE9cifier le nom du fichier symbolique de mappage clavier"
-#: src/c64/cart/c64cart.c:229 src/translate.c.po.c:1422
+#: src/c64/cart/c64cart.c:230 src/translate.c.po.c:1422
msgid "Reset machine if a cartridge is attached or detached"
msgstr "R\xE9initialiser si une cartouche est ins\xE9r\xE9e ou retir\xE9e"
-#: src/c64/cart/c64cart.c:232 src/translate.c.po.c:1432
+#: src/c64/cart/c64cart.c:233 src/translate.c.po.c:1432
msgid "Do not reset machine if a cartridge is attached or detached"
msgstr "Ne pas r\xE9initialiser si une cartouche est ins\xE9r\xE9e ou retir\xE9e"
-#: src/c64/cart/c64cart.c:235 src/arch/win32/res.rc.po.c:4998
+#: src/c64/cart/c64cart.c:236 src/arch/win32/res.rc.po.c:4998
#: src/translate.c.po.c:1442 src/arch/amigaos/intl.c.po.c:2333
msgid "Attach CRT cartridge image"
msgstr "Ins\xE9rer une cartouche CRT"
-#: src/c64/cart/c64cart.c:238 src/translate.c.po.c:1452
+#: src/c64/cart/c64cart.c:239 src/translate.c.po.c:1452
msgid "Attach generic 8KB cartridge image"
msgstr "Ins\xE9rer une cartouche g\xE9n\xE9rique 8KO"
-#: src/c64/cart/c64cart.c:241 src/translate.c.po.c:1462
+#: src/c64/cart/c64cart.c:242 src/translate.c.po.c:1462
msgid "Attach generic 16KB cartridge image"
msgstr "Ins\xE9rer une cartouche g\xE9n\xE9rique de 16KO"
-#: src/c64/cart/c64cart.c:244 src/translate.c.po.c:1482
+#: src/c64/cart/c64cart.c:245 src/translate.c.po.c:1482
msgid "Attach raw 32KB Action Replay cartridge image"
msgstr "Ins\xE9rer une cartouche Action Replay 32KO"
-#: src/c64/cart/c64cart.c:247 src/translate.c.po.c:1472
+#: src/c64/cart/c64cart.c:248 src/translate.c.po.c:1472
#, fuzzy
msgid "Attach raw 16KB Action Replay III cartridge image"
msgstr "Ins\xE9rer une cartouche Action Replay 32KO"
-#: src/c64/cart/c64cart.c:250 src/translate.c.po.c:1492
+#: src/c64/cart/c64cart.c:251 src/translate.c.po.c:1492
msgid "Attach raw 64KB Retro Replay cartridge image"
msgstr "Ins\xE9rer une cartouche Retro Replay 64KO"
-#: src/c64/cart/c64cart.c:253 src/translate.c.po.c:1502
+#: src/c64/cart/c64cart.c:254 src/translate.c.po.c:1502
msgid "Attach raw 64KB IDE64 cartridge image"
msgstr "Ins\xE9rer une cartouche IDE64 64KO"
-#: src/c64/cart/c64cart.c:256 src/translate.c.po.c:1512
+#: src/c64/cart/c64cart.c:257 src/translate.c.po.c:1512
msgid "Attach raw 32KB Atomic Power cartridge image"
msgstr "Ins\xE9rer une cartouche Atomic Power 32KO"
-#: src/c64/cart/c64cart.c:259 src/translate.c.po.c:1522
+#: src/c64/cart/c64cart.c:260 src/translate.c.po.c:1522
msgid "Attach raw 8KB Epyx fastload cartridge image"
msgstr "Ins\xE9rer une cartouche Epyx FastLoad 8KO"
-#: src/c64/cart/c64cart.c:262 src/translate.c.po.c:1532
+#: src/c64/cart/c64cart.c:263 src/translate.c.po.c:1532
msgid "Attach raw 32KB Super Snapshot cartridge image"
msgstr "Ins\xE9rer une cartouche Super Snapshot 32KO"
-#: src/c64/cart/c64cart.c:265 src/translate.c.po.c:1542
+#: src/c64/cart/c64cart.c:266 src/translate.c.po.c:1542
msgid "Attach raw 64KB Super Snapshot cartridge image"
msgstr "Ins\xE9rer une cartouche Super Snapshot 64KO"
-#: src/c64/cart/c64cart.c:268 src/translate.c.po.c:1552
+#: src/c64/cart/c64cart.c:269 src/translate.c.po.c:1552
msgid "Attach CBM IEEE488 cartridge image"
msgstr "Ins\xE9rer une cartouche CBM IEEE488"
-#: src/c64/cart/c64cart.c:271 src/translate.c.po.c:1562
+#: src/c64/cart/c64cart.c:272 src/translate.c.po.c:1562
msgid "Attach raw 16KB Westermann learning cartridge image"
msgstr "Ins\xE9rer une cartouche Westermann Learning 16KO"
-#: src/c64/cart/c64cart.c:274 src/translate.c.po.c:4775
+#: src/c64/cart/c64cart.c:275 src/translate.c.po.c:4785
#, fuzzy
msgid "Attach raw Structured Basic cartridge image"
msgstr "Ins\xE9rer une &cartouche"
-#: src/c64/cart/c64cart.c:277 src/translate.c.po.c:1572
+#: src/c64/cart/c64cart.c:278 src/translate.c.po.c:1572
msgid "Enable expert cartridge"
msgstr "Activer les param\xE8tres experts de cartouches"
@@ -845,17 +845,17 @@
msgid "Do not autodetect geometry of formatted images"
msgstr "Ne pas d\xE9tecter automatiquement la g\xE9om\xE9trie des images formatt\xE9es"
-#: src/c64/c64_256k.c:206 src/translate.c.po.c:4735
+#: src/c64/c64_256k.c:206 src/translate.c.po.c:4745
#, fuzzy
msgid "Enable the 256K RAM expansion"
msgstr "Activer l'expansion RAM +60K"
-#: src/c64/c64_256k.c:208 src/translate.c.po.c:4745
+#: src/c64/c64_256k.c:208 src/translate.c.po.c:4755
#, fuzzy
msgid "Disable the 256K RAM expansion"
msgstr "D\xE9sactiver l'expansion RAM +60K"
-#: src/c64/c64_256k.c:210 src/translate.c.po.c:4755
+#: src/c64/c64_256k.c:210 src/translate.c.po.c:4765
#, fuzzy
msgid "Specify name of 256K image"
msgstr "Sp\xE9cifier le nom de l'image +60K"
@@ -865,7 +865,7 @@
msgid "<base address>"
msgstr "<adresse de base>"
-#: src/c64/c64_256k.c:212 src/translate.c.po.c:4765
+#: src/c64/c64_256k.c:212 src/translate.c.po.c:4775
#, fuzzy
msgid "Base address of the 256K expansion"
msgstr "D\xE9sactiver l'expansion RAM +60K"
@@ -876,17 +876,17 @@
"Please switch SID Engine to FastSID"
msgstr ""
-#: src/c64/digimax.c:137 src/translate.c.po.c:4825
+#: src/c64/digimax.c:137 src/translate.c.po.c:4835
#, fuzzy
msgid "Enable the digimax cartridge"
msgstr "Activer les param\xE8tres experts de cartouches"
-#: src/c64/digimax.c:139 src/translate.c.po.c:4835
+#: src/c64/digimax.c:139 src/translate.c.po.c:4845
#, fuzzy
msgid "Disable the digimax cartridge"
msgstr "Activer les param\xE8tres experts de cartouches"
-#: src/c64/digimax.c:141 src/translate.c.po.c:4845
+#: src/c64/digimax.c:141 src/translate.c.po.c:4855
#, fuzzy
msgid "Base address of the digimax cartridge"
msgstr "D\xE9sactiver l'expansion RAM +60K"
@@ -944,37 +944,37 @@
msgid "Save the MMC64 bios when changed"
msgstr ""
-#: src/c64/plus256k.c:171 src/translate.c.po.c:4665
+#: src/c64/plus256k.c:171 src/translate.c.po.c:4675
#, fuzzy
msgid "Enable the PLUS256K RAM expansion"
msgstr "Activer l'expansion RAM +60K"
-#: src/c64/plus256k.c:173 src/translate.c.po.c:4675
+#: src/c64/plus256k.c:173 src/translate.c.po.c:4685
#, fuzzy
msgid "Disable the PLUS256K RAM expansion"
msgstr "D\xE9sactiver l'expansion RAM +60K"
-#: src/c64/plus256k.c:175 src/translate.c.po.c:4685
+#: src/c64/plus256k.c:175 src/translate.c.po.c:4695
#, fuzzy
msgid "Specify name of PLUS256K image"
msgstr "Sp\xE9cifier le nom de l'image +60K"
-#: src/c64/plus60k.c:245 src/translate.c.po.c:4695
+#: src/c64/plus60k.c:245 src/translate.c.po.c:4705
#, fuzzy
msgid "Enable the PLUS60K RAM expansion"
msgstr "Activer l'expansion RAM +60K"
-#: src/c64/plus60k.c:247 src/translate.c.po.c:4705
+#: src/c64/plus60k.c:247 src/translate.c.po.c:4715
#, fuzzy
msgid "Disable the PLUS60K RAM expansion"
msgstr "D\xE9sactiver l'expansion RAM +60K"
-#: src/c64/plus60k.c:249 src/translate.c.po.c:4715
+#: src/c64/plus60k.c:249 src/translate.c.po.c:4725
#, fuzzy
msgid "Specify name of PLUS60K image"
msgstr "Sp\xE9cifier le nom de l'image +60K"
-#: src/c64/plus60k.c:251 src/translate.c.po.c:4725
+#: src/c64/plus60k.c:251 src/translate.c.po.c:4735
#, fuzzy
msgid "Base address of the PLUS60K expansion"
msgstr "D\xE9sactiver l'expansion RAM +60K"
@@ -1336,7 +1336,7 @@
msgid "Specify name of 1551 DOS ROM image"
msgstr "Sp\xE9cifier le nom de l'image 1551 DOS ROM"
-#: src/fliplist.c:121 src/translate.c.po.c:4194
+#: src/fliplist.c:121 src/translate.c.po.c:4204
msgid "Specify name of the flip list file image"
msgstr "Sp\xE9cifier le nom de l'image du fichier de groupement de disques"
@@ -1382,89 +1382,89 @@
msgstr "ffmpegdrv: Impossible d'ouvrir %s"
#: src/initcmdline.c:155 src/initcmdline.c:157 src/initcmdline.c:159
-#: src/translate.c.po.c:4203
+#: src/translate.c.po.c:4213
msgid "Show a list of the available options and exit normally"
msgstr "Montrer une liste des options disponibles et terminer normalement"
-#: src/initcmdline.c:162 src/translate.c.po.c:4214
+#: src/initcmdline.c:162 src/translate.c.po.c:4224
msgid "Console mode (for music playback)"
msgstr "Mode console (pour l'\xE9coute de musique)"
-#: src/initcmdline.c:164 src/translate.c.po.c:4224
+#: src/initcmdline.c:164 src/translate.c.po.c:4234
msgid "Allow production of core dumps"
msgstr "Permettre la production de \"core dumps\""
-#: src/initcmdline.c:166 src/translate.c.po.c:4234
+#: src/initcmdline.c:166 src/translate.c.po.c:4244
msgid "Do not produce core dumps"
msgstr "Ne pas produire de \"core dumps\""
-#: src/initcmdline.c:169 src/translate.c.po.c:4244
+#: src/initcmdline.c:169 src/translate.c.po.c:4254
msgid "Don't call exception handler"
msgstr "Ne pas utiliser l'assistant d'exception"
-#: src/initcmdline.c:171 src/translate.c.po.c:4254
+#: src/initcmdline.c:171 src/translate.c.po.c:4264
msgid "Call exception handler (default)"
msgstr "Utiliser l'assistant d'exception par d\xE9faut"
-#: src/initcmdline.c:206 src/translate.c.po.c:4265
+#: src/initcmdline.c:206 src/translate.c.po.c:4275
msgid "Restore default (factory) settings"
msgstr "R\xE9tablir les param\xE8tres par d\xE9faut"
-#: src/initcmdline.c:208 src/translate.c.po.c:4275
+#: src/initcmdline.c:208 src/translate.c.po.c:4285
msgid "Attach and autostart tape/disk image <name>"
msgstr "Ins\xE9rer et d\xE9marrer l'image de disque/datassette <nom>"
-#: src/initcmdline.c:210 src/translate.c.po.c:4285
+#: src/initcmdline.c:210 src/translate.c.po.c:4295
msgid "Attach and autoload tape/disk image <name>"
msgstr "Ins\xE9rer et charger l'image de disque/datassette <nom>"
-#: src/initcmdline.c:212 src/translate.c.po.c:4295
+#: src/initcmdline.c:212 src/translate.c.po.c:4305
msgid "Attach <name> as a tape image"
msgstr "Ins\xE9rer <nom> comme image de datassette"
-#: src/initcmdline.c:214 src/translate.c.po.c:4305
+#: src/initcmdline.c:214 src/translate.c.po.c:4315
msgid "Attach <name> as a disk image in drive #8"
msgstr "Ins\xE9rer <nom> comme image de disque dans le lecteur #8"
-#: src/initcmdline.c:216 src/translate.c.po.c:4315
+#: src/initcmdline.c:216 src/translate.c.po.c:4325
msgid "Attach <name> as a disk image in drive #9"
msgstr "Ins\xE9rer <nom> comme image de disque dans le lecteur #9"
-#: src/initcmdline.c:218 src/translate.c.po.c:4325
+#: src/initcmdline.c:218 src/translate.c.po.c:4335
msgid "Attach <name> as a disk image in drive #10"
msgstr "Ins\xE9rer <nom> comme image de disque dans le lecteur #10"
-#: src/initcmdline.c:220 src/translate.c.po.c:4335
+#: src/initcmdline.c:220 src/translate.c.po.c:4345
msgid "Attach <name> as a disk image in drive #11"
msgstr "Ins\xE9rer <nom> comme image de disque dans le lecteur #11"
-#: src/kbdbuf.c:136 src/translate.c.po.c:4345
+#: src/kbdbuf.c:136 src/translate.c.po.c:4355
msgid "<string>"
msgstr "<chaine>"
-#: src/kbdbuf.c:136 src/translate.c.po.c:4355
+#: src/kbdbuf.c:136 src/translate.c.po.c:4365
msgid "Put the specified string into the keyboard buffer"
msgstr "Placer la cha\xEEne de caract\xE8res sp\xE9cifi\xE9e dans le tampon clavier"
-#: src/log.c:110 src/translate.c.po.c:4365
+#: src/log.c:110 src/translate.c.po.c:4375
msgid "Specify log file name"
msgstr "Sp\xE9cifier le nom du fichier log"
-#: src/mouse.c:358 src/translate.c.po.c:4375
+#: src/mouse.c:358 src/translate.c.po.c:4385
#, fuzzy
msgid "Enable mouse grab"
msgstr "*Activer le mode Turbo"
-#: src/mouse.c:360 src/translate.c.po.c:4385
+#: src/mouse.c:360 src/translate.c.po.c:4395
#, fuzzy
msgid "Disable mouse grab"
msgstr "D\xE9sactiver le mode double scan"
-#: src/mouse.c:362 src/translate.c.po.c:4395
+#: src/mouse.c:362 src/translate.c.po.c:4405
msgid "Select the joystick port the mouse is attached to"
msgstr "S\xE9lectionner le port joystick sur lequel la souris est attach\xE9e"
-#: src/mouse.c:364 src/translate.c.po.c:4405
+#: src/mouse.c:364 src/translate.c.po.c:4415
msgid "Select the mouse type (0 = 1351, 1 = NEOS, 2 = Amiga)"
msgstr ""
@@ -1592,22 +1592,22 @@
msgid "Specify size of RAM installed in kb (16/32/64)"
msgstr "Sp\xE9cifier la taille du RAM install\xE9 (16/32/64)"
-#: src/plus4/plus4memcsory256k.c:120 src/translate.c.po.c:4785
+#: src/plus4/plus4memcsory256k.c:120 src/translate.c.po.c:4795
#, fuzzy
msgid "Enable the CSORY 256K RAM expansion"
msgstr "Activer l'expansion RAM +60K"
-#: src/plus4/plus4memhannes256k.c:135 src/translate.c.po.c:4795
+#: src/plus4/plus4memhannes256k.c:135 src/translate.c.po.c:4805
#, fuzzy
msgid "Enable the HANNES 256K RAM expansion"
msgstr "Activer l'expansion RAM +60K"
-#: src/plus4/plus4memhannes256k.c:137 src/translate.c.po.c:4805
+#: src/plus4/plus4memhannes256k.c:137 src/translate.c.po.c:4815
#, fuzzy
msgid "Enable the HANNES 1024K RAM expansion"
msgstr "Activer l'expansion RAM +60K"
-#: src/plus4/plus4memhannes256k.c:139 src/translate.c.po.c:4815
+#: src/plus4/plus4memhannes256k.c:139 src/translate.c.po.c:4825
#, fuzzy
msgid "Enable the HANNES 4096K RAM expansion"
msgstr "Activer l'expansion RAM +60K"
@@ -1689,20 +1689,20 @@
msgid "Specify printer text output device for userport printer"
msgstr "Sp\xE9cifier le p\xE9riph\xE9rique de sortie text pour l'imprimante userport"
-#: src/ram.c:101 src/translate.c.po.c:4415
+#: src/ram.c:101 src/translate.c.po.c:4425
msgid "Set the value for the very first RAM address after powerup"
msgstr ""
"Sp\xE9cifier la valeur de la premi\xE8re adresse RAM apr\xE8s la mise sous tension"
-#: src/ram.c:104 src/ram.c:107 src/translate.c.po.c:4425
+#: src/ram.c:104 src/ram.c:107 src/translate.c.po.c:4435
msgid "<num of bytes>"
msgstr "<nombre d'octets>"
-#: src/ram.c:104 src/translate.c.po.c:4435
+#: src/ram.c:104 src/translate.c.po.c:4445
msgid "Length of memory block initialized with the same value"
msgstr "Longeur du premier bloc m\xE9moire initialis\xE9 avec la m\xEAme valeur"
-#: src/ram.c:107 src/translate.c.po.c:4445
+#: src/ram.c:107 src/translate.c.po.c:4455
msgid "Length of memory block initialized with the same pattern"
msgstr "Longeur du premier bloc m\xE9moire initialis\xE9 avec le m\xEAme pattern"
@@ -1924,20 +1924,20 @@
msgid "Do not emulate SID filters"
msgstr "Ne pas \xE9muler les filtres SID"
-#: src/sysfile.c:127 src/translate.c.po.c:4565
+#: src/sysfile.c:127 src/translate.c.po.c:4575
msgid "<path>"
msgstr "<chemin>"
-#: src/sysfile.c:127 src/translate.c.po.c:4575
+#: src/sysfile.c:127 src/translate.c.po.c:4585
msgid "Define search path to locate system files"
msgstr "D\xE9finir le chemin de recherche pour trouver les fichiers syst\xE8mes"
-#: src/traps.c:123 src/translate.c.po.c:4585
+#: src/traps.c:123 src/translate.c.po.c:4595
msgid "Enable general mechanisms for fast disk/tape emulation"
msgstr ""
"Activer les m\xE9chanismes g\xE9n\xE9raux pour l'\xE9mulation disque/datassette rapide"
-#: src/traps.c:126 src/translate.c.po.c:4595
+#: src/traps.c:126 src/translate.c.po.c:4605
msgid "Disable general mechanisms for fast disk/tape emulation"
msgstr ""
"D\xE9sactiver les m\xE9chanismes g\xE9n\xE9raux pour l'\xE9mulation disque/datassette rapide"
@@ -1970,23 +1970,23 @@
msgid "Disable VIC-1112 IEEE488 interface"
msgstr "D\xE9sactiver l'interface VIC-1112 IEEE488"
-#: src/vic20/vic20cartridge.c:211 src/translate.c.po.c:3558
+#: src/vic20/vic20cartridge.c:212 src/translate.c.po.c:3558
msgid "Specify 4/8/16K extension ROM name at $2000"
msgstr "Sp\xE9cifier le nom de l'extension ROM 4/8/16K \xE0 $2000"
-#: src/vic20/vic20cartridge.c:213 src/translate.c.po.c:3568
+#: src/vic20/vic20cartridge.c:214 src/translate.c.po.c:3568
msgid "Specify 4/8/16K extension ROM name at $4000"
msgstr "Sp\xE9cifier le nom de l'extension ROM 4/8/16K \xE0 $4000"
-#: src/vic20/vic20cartridge.c:215 src/translate.c.po.c:3578
+#: src/vic20/vic20cartridge.c:216 src/translate.c.po.c:3578
msgid "Specify 4/8/16K extension ROM name at $6000"
msgstr "Sp\xE9cifier le nom de l'extension ROM 4/8/16K \xE0 $6000"
-#: src/vic20/vic20cartridge.c:217 src/translate.c.po.c:3588
+#: src/vic20/vic20cartridge.c:218 src/translate.c.po.c:3588
msgid "Specify 4/8K extension ROM name at $A000"
msgstr "Sp\xE9cifier le nom de l'extension ROM 4/8K \xE0 $A000"
-#: src/vic20/vic20cartridge.c:219 src/translate.c.po.c:3598
+#: src/vic20/vic20cartridge.c:220 src/translate.c.po.c:3598
msgid "Specify 4K extension ROM name at $B000"
msgstr "Sp\xE9cifier le nom de l'extension ROM 4K \xE0 $B000"
@@ -2250,13 +2250,13 @@
#: src/arch/unix/gui/c128ui.c:71 src/arch/unix/gui/c64ui.c:74
#: src/arch/unix/gui/cbm2ui.c:64 src/arch/unix/gui/uited.c:56
-#: src/arch/unix/gui/uivic.c:45 src/arch/unix/gui/vsidui.c:286
+#: src/arch/unix/gui/uivic.c:45 src/arch/unix/gui/vsidui.c:290
msgid "*PAL-G"
msgstr "*PAL-G"
#: src/arch/unix/gui/c128ui.c:73 src/arch/unix/gui/c64ui.c:76
#: src/arch/unix/gui/cbm2ui.c:66 src/arch/unix/gui/uited.c:58
-#: src/arch/unix/gui/uivic.c:47 src/arch/unix/gui/vsidui.c:288
+#: src/arch/unix/gui/uivic.c:47 src/arch/unix/gui/vsidui.c:292
msgid "*NTSC-M"
msgstr "*NTSC-M"
@@ -2264,21 +2264,21 @@
#: src/arch/unix/gui/c64ui.c:225 src/arch/unix/gui/c64ui.c:250
#: src/arch/unix/gui/cbm2ui.c:293 src/arch/unix/gui/cbm2ui.c:318
#: src/arch/unix/gui/petui.c:119 src/arch/unix/gui/plus4ui.c:106
-#: src/arch/unix/gui/vic20ui.c:142 src/arch/unix/gui/vsidui.c:198
+#: src/arch/unix/gui/vic20ui.c:142 src/arch/unix/gui/vsidui.c:202
msgid "SID engine"
msgstr "Engin SID"
#: src/arch/unix/gui/c128ui.c:157 src/arch/unix/gui/c128ui.c:183
#: src/arch/unix/gui/c64ui.c:228 src/arch/unix/gui/c64ui.c:254
#: src/arch/unix/gui/cbm2ui.c:296 src/arch/unix/gui/cbm2ui.c:322
-#: src/arch/unix/gui/vsidui.c:201
+#: src/arch/unix/gui/vsidui.c:205
msgid "*Second SID"
msgstr "*Second SID"
#: src/arch/unix/gui/c128ui.c:159 src/arch/unix/gui/c128ui.c:185
#: src/arch/unix/gui/c64ui.c:230 src/arch/unix/gui/c64ui.c:256
#: src/arch/unix/gui/cbm2ui.c:298 src/arch/unix/gui/cbm2ui.c:324
-#: src/arch/unix/gui/vsidui.c:203
+#: src/arch/unix/gui/vsidui.c:207
msgid "*Second SID base address"
msgstr "*Adresse de base du second SID"
@@ -2286,7 +2286,7 @@
#: src/arch/unix/gui/c64ui.c:233 src/arch/unix/gui/c64ui.c:258
#: src/arch/unix/gui/cbm2ui.c:301 src/arch/unix/gui/cbm2ui.c:327
#: src/arch/unix/gui/petui.c:123 src/arch/unix/gui/plus4ui.c:110
-#: src/arch/unix/gui/vic20ui.c:146 src/arch/unix/gui/vsidui.c:206
+#: src/arch/unix/gui/vic20ui.c:146 src/arch/unix/gui/vsidui.c:210
msgid "*Emulate filters"
msgstr "*\xC9muler les filtres"
@@ -2294,17 +2294,17 @@
#: src/arch/unix/gui/c64ui.c:235 src/arch/unix/gui/c64ui.c:260
#: src/arch/unix/gui/cbm2ui.c:303 src/arch/unix/gui/cbm2ui.c:329
#: src/arch/unix/gui/petui.c:121 src/arch/unix/gui/plus4ui.c:108
-#: src/arch/unix/gui/vic20ui.c:144 src/arch/unix/gui/vsidui.c:208
+#: src/arch/unix/gui/vic20ui.c:144 src/arch/unix/gui/vsidui.c:212
msgid "Chip model"
msgstr "Mod\xE8le de puce"
#: src/arch/unix/gui/c128ui.c:168 src/arch/unix/gui/c64ui.c:239
-#: src/arch/unix/gui/cbm2ui.c:307 src/arch/unix/gui/vsidui.c:212
+#: src/arch/unix/gui/cbm2ui.c:307 src/arch/unix/gui/vsidui.c:216
msgid "reSID sampling method"
msgstr "M\xE9thode d'\xE9chantillonnage reSID"
#: src/arch/unix/gui/c128ui.c:170 src/arch/unix/gui/c64ui.c:241
-#: src/arch/unix/gui/cbm2ui.c:309 src/arch/unix/gui/vsidui.c:214
+#: src/arch/unix/gui/cbm2ui.c:309 src/arch/unix/gui/vsidui.c:218
msgid "reSID resampling passband..."
msgstr "Bande passante de r\xE9\xE9chantillonnage reSID..."
@@ -2485,7 +2485,7 @@
msgstr "Param\xE8tres VDC"
#: src/arch/unix/gui/c128ui.c:380 src/arch/unix/gui/c64ui.c:366
-#: src/arch/unix/gui/cbm2ui.c:360 src/arch/unix/gui/vsidui.c:336
+#: src/arch/unix/gui/cbm2ui.c:360 src/arch/unix/gui/vsidui.c:340
#: src/arch/win32/ressid.rc.po.c:59
msgid "SID settings"
msgstr "Param\xE8tres SID"
@@ -2507,7 +2507,7 @@
#: src/arch/unix/gui/c128ui.c:510 src/arch/unix/gui/c64ui.c:494
#: src/arch/unix/gui/cbm2ui.c:505 src/arch/unix/gui/petui.c:487
#: src/arch/unix/gui/plus4ui.c:314 src/arch/unix/gui/vic20ui.c:603
-#: src/arch/unix/gui/vsidui.c:393 src/arch/amigaos/intl.c.po.c:96
+#: src/arch/unix/gui/vsidui.c:397 src/arch/amigaos/intl.c.po.c:96
msgid "File"
msgstr "Fichier"
@@ -2528,7 ...
[truncated message content] |
|
From: <st...@us...> - 2008-05-25 18:59:05
|
Revision: 18808
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18808&view=rev
Author: strik
Date: 2008-05-25 11:59:05 -0700 (Sun, 25 May 2008)
Log Message:
-----------
2008-05-25 Christian Vogelgsang <ch...@vo...>
* configure.in: honor OBJCFLAGS if available. added Carbon lib
for Cocoa linking.
* build/Makefile.am, build/macosx/build-vice-release.sh: added
build-vice-release script
* Makefile.am: make bindist on Macs need the bash
* data/C64/Makefile.am, data/C64/osx_sym_de.vkm,
data/C64/osx_pos.vkm, data/C64/osx_sym_us.vkm: fixed Cocoa key
maps
* src/arch/unix/archdep.[ch]: made archdep_pref_path const.
* src/arch/unix/macosx/make-bindist.sh,
src/arch/unix/macosx/Info.plist: added crt file format. use new
icons for Cocoa port.
* src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj: added
VICE XCode project to manage nib files more easily
* src/arch/unix/macosx/cocoa/main.m: store preferences in
~/Library/Preferences/org.viceteam.<emu> now
* src/arch/unix/macosx/cocoa/uimon.m,
src/arch/unix/macosx/cocoa/console.m,
src/arch/unix/macosx/cocoa/menu/c64machinecontroller.m:
deprecated NSString calls removed
* src/arch/unix/macosx/cocoa/kbd.h: added cocoa sym_de keymap
* src/arch/unix/macosx/cocoa/videoarch.h,
src/arch/unix/macosx/cocoa/viceapplication.h,
src/arch/unix/macosx/cocoa/vicemachine.h,
src/arch/unix/macosx/cocoa/video.m,
src/arch/unix/macosx/cocoa/vicemachine.m: added canvasId to
manage canvas ptr on App side
* src/arch/unix/macosx/cocoa/kbd.m: added missing include
* src/arch/unix/macosx/cocoa/fullscreen.m: removed obsolete
function
* src/arch/unix/macosx/cocoa/view/joystickview.m,
src/arch/unix/macosx/cocoa/view/keypressview.m: removed compile
warning
* src/arch/unix/macosx/cocoa/view/consolewindow.m: fixed output
bug
* src/arch/unix/macosx/cocoa/view/viceglview.[hm]: added auto
hide mouse and menu
* src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.[hm]:
added resource methods
* src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.[hm]:
rewrote drive settings UI
* src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.[hm],
src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.[hm]:
added resource editor
* src/arch/unix/macosx/cocoa/dialog/printersettingswindowcontroller.[hm]:
added printer settings UI
* src/arch/unix/macosx/cocoa/dialog/soundsettingswindowcontroller.[hm]:
added sound settings UI
* src/arch/unix/macosx/cocoa/dialog/iecdrivesettingswindowcontroller.[hm]:
added IEC drive settings UI
* src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.[hm]:
added record media UI
* src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.[hm]:
added keyboard settings UI
* src/arch/unix/macosx/cocoa/menu/viceappcontroller.[hm],
src/arch/unix/macosx/cocoa/menu/c64controller.[hm]: added new UI
dialogs
* src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.[hm]:
added machine control functions for new UI features
* src/arch/unix/macosx/Resources/English.lproj/*: added nib
files for new UI
* src/arch/unix/macosx/Makefile.am,
src/arch/unix/macosx/Resources/Makefile.am,
src/arch/unix/macosx/cocoa/dialog/Makefile.am: added new files
Modified Paths:
--------------
trunk/vice/ChangeLog
trunk/vice/Makefile.am
trunk/vice/build/Makefile.am
trunk/vice/configure.in
trunk/vice/data/C64/Makefile.am
trunk/vice/data/C64/osx_pos.vkm
trunk/vice/src/ChangeLog
trunk/vice/src/arch/unix/archdep.c
trunk/vice/src/arch/unix/archdep.h
trunk/vice/src/arch/unix/macosx/Info.plist
trunk/vice/src/arch/unix/macosx/Makefile.am
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/JoystickSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/Makefile.am
trunk/vice/src/arch/unix/macosx/cocoa/console.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.am
trunk/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/fullscreen.m
trunk/vice/src/arch/unix/macosx/cocoa/kbd.h
trunk/vice/src/arch/unix/macosx/cocoa/kbd.m
trunk/vice/src/arch/unix/macosx/cocoa/main.m
trunk/vice/src/arch/unix/macosx/cocoa/menu/c64controller.h
trunk/vice/src/arch/unix/macosx/cocoa/menu/c64controller.m
trunk/vice/src/arch/unix/macosx/cocoa/menu/c64machinecontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/uimon.m
trunk/vice/src/arch/unix/macosx/cocoa/viceapplication.h
trunk/vice/src/arch/unix/macosx/cocoa/viceapplication.m
trunk/vice/src/arch/unix/macosx/cocoa/vicemachine.h
trunk/vice/src/arch/unix/macosx/cocoa/vicemachine.m
trunk/vice/src/arch/unix/macosx/cocoa/video.m
trunk/vice/src/arch/unix/macosx/cocoa/videoarch.h
trunk/vice/src/arch/unix/macosx/cocoa/view/consolewindow.m
trunk/vice/src/arch/unix/macosx/cocoa/view/fullscreenwindow.m
trunk/vice/src/arch/unix/macosx/cocoa/view/joystickview.m
trunk/vice/src/arch/unix/macosx/cocoa/view/keypressview.m
trunk/vice/src/arch/unix/macosx/cocoa/view/viceglview.h
trunk/vice/src/arch/unix/macosx/cocoa/view/viceglview.m
trunk/vice/src/arch/unix/macosx/cocoa/view/vicewindow.m
trunk/vice/src/arch/unix/macosx/make-bindist.sh
Added Paths:
-----------
trunk/vice/build/macosx/build-vice-release.sh
trunk/vice/data/C64/osx_sym_de.vkm
trunk/vice/data/C64/osx_sym_us.vkm
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceTree.plist
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/VICE.icns
trunk/vice/src/arch/unix/macosx/Resources/cartridge.icns
trunk/vice/src/arch/unix/macosx/Resources/floppy525.icns
trunk/vice/src/arch/unix/macosx/Resources/tape.icns
trunk/vice/src/arch/unix/macosx/Resources/x128.icns
trunk/vice/src/arch/unix/macosx/Resources/x64.icns
trunk/vice/src/arch/unix/macosx/Resources/x65.icns
trunk/vice/src/arch/unix/macosx/Resources/xcbm2.icns
trunk/vice/src/arch/unix/macosx/Resources/xpet.icns
trunk/vice/src/arch/unix/macosx/Resources/xplus4.icns
trunk/vice/src/arch/unix/macosx/Resources/xvic.icns
trunk/vice/src/arch/unix/macosx/VICE.xcodeproj/
trunk/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj
trunk/vice/src/arch/unix/macosx/cocoa/dialog/iecdrivesettingswindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/iecdrivesettingswindowcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/printersettingswindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/printersettingswindowcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m
trunk/vice/src/arch/unix/macosx/cocoa/dialog/soundsettingswindowcontroller.h
trunk/vice/src/arch/unix/macosx/cocoa/dialog/soundsettingswindowcontroller.m
Removed Paths:
-------------
trunk/vice/data/C64/osx_sym.vkm
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/IECDriveSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/PrinterSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/ResourceEditor.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/classes.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/info.nib
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/SoundSettings.nib/keyedobjects.nib
trunk/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj
Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/ChangeLog 2008-05-25 18:59:05 UTC (rev 18808)
@@ -1,3 +1,17 @@
+2008-05-25 Christian Vogelgsang <ch...@vo...>
+
+ * configure.in: honor OBJCFLAGS if available. added Carbon lib
+ for Cocoa linking.
+
+ * build/Makefile.am, build/macosx/build-vice-release.sh: added
+ build-vice-release script
+
+ * Makefile.am: make bindist on Macs need the bash
+
+ * data/C64/Makefile.am, data/C64/osx_sym_de.vkm,
+ data/C64/osx_pos.vkm, data/C64/osx_sym_us.vkm: fixed Cocoa key
+ maps
+
2008-05-19 Spiro Trikaliotis <spi...@gm...>
* autogen.sh: Removed "bash-ism" from script (compare with "=="
Modified: trunk/vice/Makefile.am
===================================================================
--- trunk/vice/Makefile.am 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/Makefile.am 2008-05-25 18:59:05 UTC (rev 18808)
@@ -60,10 +60,10 @@
if UNIX_MACOSX_COMPILE
bindist:
- $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@
+ /bin/bash @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) nozip @UNIX_MACOSX_UITYPE@
bindistzip:
- $(SHELL) @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@
+ /bin/bash @ARCH_SRC_DIR@/macosx/make-bindist.sh $(top_srcdir) $(STRIP) $(VICE_VERSION) zip @UNIX_MACOSX_UITYPE@
endif
if UNIX_SKYOS_COMPILE
Modified: trunk/vice/build/Makefile.am
===================================================================
--- trunk/vice/build/Makefile.am 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/build/Makefile.am 2008-05-25 18:59:05 UTC (rev 18808)
@@ -11,6 +11,7 @@
macosx/build-readline.sh \
macosx/build-vice-dist.sh \
macosx/build-ffmpeglame.sh \
+ macosx/build-vice-release.sh \
minix3/build.sh \
minix3/build-package.sh \
qnx4/build.sh \
Copied: trunk/vice/build/macosx/build-vice-release.sh (from rev 18806, tags/chris/v1.22.15-cocoa-port/build/macosx/build-vice-release.sh)
===================================================================
--- trunk/vice/build/macosx/build-vice-release.sh (rev 0)
+++ trunk/vice/build/macosx/build-vice-release.sh 2008-05-25 18:59:05 UTC (rev 18808)
@@ -0,0 +1,153 @@
+#!/bin/bash
+#
+# build snapshot binaries for x11 gtk and cocoa from the SVN
+#
+# written by Christian Vogelgsang <ch...@vo...>
+#
+# Usage:
+# build-vice-release [-s] [<vice-svn-repository>] [<path to extlib>] [<target dir>] [<arch>] [<uis>]
+# -s = snapshot
+
+echo "--- build VICE release from SVN repository ---"
+
+# is a snapshot
+SNAPSHOT=0
+if [ "x$1" = "x-s" ]; then
+ SNAPSHOT=1
+ shift
+fi
+
+# check repository directory
+SVN_REPO="$1"
+if [ "x$SVN_REPO" = x ]; then
+ SVN_REPO=vice-emu-cocoa
+fi
+if [ ! -d "$SVN_REPO" ]; then
+ echo "ERROR: SVN repository '$SVN_REPO' not found!"
+ exit 1
+fi
+SVN_REPO="`(cd \"$SVN_REPO\" && pwd -P)`"
+echo "SVN repository: $SVN_REPO"
+
+# check extlib directory
+EXTLIB="$2"
+if [ "x$EXTLIB" = x ]; then
+ EXTLIB=extlib
+fi
+if [ ! -d "$EXTLIB" ]; then
+ echo "ERROR: external libs '$EXTLIB' not found!"
+ exit 1
+fi
+EXTLIB="`(cd \"$EXTLIB\" && pwd)`"
+echo "external libs: $EXTLIB"
+
+# check target dir
+BUILD_DIR="$3"
+if [ "x$BUILD_DIR" = x ]; then
+ if [ $SNAPSHOT = 1 ]; then
+ BUILD_DIR=build-vice-snapshot
+ else
+ BUILD_DIR=build-vice-release
+ fi
+fi
+if [ -d "$BUILD_DIR" ]; then
+ echo "ERROR: $BUILD_DIR already exists!"
+ exit 1
+fi
+BUILD_DIR="`pwd`/$BUILD_DIR"
+echo "build dir: $BUILD_DIR"
+
+# get revision of build
+REVISION=`(cd "$SVN_REPO" && svn info | grep Revision | awk '{ print $2 }')`
+echo "SVN revision: $REVISION"
+
+# create build src dir
+echo "creating dir $BUILD_DIR"
+mkdir -p "$BUILD_DIR"
+if [ ! -d "$BUILD_DIR" ]; then
+ echo "ERROR: can't creat dir!"
+ exit 1
+fi
+
+# export fresh source
+SRC_DIR="$BUILD_DIR/src"
+echo "exporting src $SRC_DIR"
+svn export "$SVN_REPO" "$SRC_DIR"
+if [ $? != 0 ]; then
+ echo "ERROR: export faild!"
+ exit 1
+fi
+
+# patch BUILD version if doing snapshot
+if [ $SNAPSHOT = 1 ]; then
+ # tag
+ DATE=`date '+%Y%m%d'`
+ TAG="-r${REVISION}_$DATE"
+
+ # patch VICE_VERSION_BUILD
+ echo "patching configure.in: $TAG"
+ PATCH_VVB="$SRC_DIR/configure.in"
+ perl -pi -e "s/(VICE_VERSION_BUILD=\d+).*\$/\$1$TAG/" $PATCH_VVB
+ if [ $? != 0 ]; then
+ echo "ERROR: patching..."
+ exit 1
+ fi
+fi
+
+# configure snapshot
+echo "configuring new source tree"
+(cd "$SRC_DIR/src/resid" && aclocal && automake && autoconf) >/dev/null 2>&1
+if [ $? != 0 ]; then
+ echo "ERROR: configuring resid..."
+ exit 1
+fi
+(cd "$SRC_DIR" && aclocal && autoheader && automake --add-missing && autoconf) >/dev/null 2>&1
+if [ $? != 0 ]; then
+ echo "ERROR: configuring VICE..."
+ exit 1
+fi
+
+# build dists
+ARCH="$4"
+if [ "x$ARCH" = "x" ]; then
+ ARCH="ub"
+fi
+UI="$5"
+if [ "x$UI" = "x" ]; then
+ UI="x11 gtk cocoa"
+fi
+if [ "$UI" != "none" ]; then
+ echo "--- binaries for $UI ---"
+ for dist in $UI ; do
+ echo "building binaries for $dist/$ARCH"
+ LOG="$BUILD_DIR/build-$dist.log"
+ (cd "$SRC_DIR" && $BASH build/macosx/build-vice-dist.sh $ARCH $dist dmg "$EXTLIB" "$BUILD_DIR") >"$LOG" 2>&1
+ FILES="$(ls $BUILD_DIR/$dist/$ARCH/*.dmg 2>/dev/null)"
+ echo "generated files: $FILES"
+ if [ "x$FILES" = "x" ]; then
+ echo "no file found!"
+ exit 1
+ fi
+ grep +++ "$LOG"
+ du -sh "$FILES"
+ mv "$FILES" "$BUILD_DIR"
+ done
+fi
+
+# packing source
+echo "--- source ---"
+echo "packing source"
+DEST_DIR="$BUILD_DIR/tarball"
+mkdir "$DEST_DIR"
+if [ ! -d "$DEST_DIR" ]; then
+ echo "ERROR: creating dir"
+ exit 1
+fi
+(cd "$DEST_DIR" && $SRC_DIR/configure && make dist) >/dev/null 2>&1
+FILES="$(ls $DEST_DIR/*.tar.gz 2>/dev/null)"
+echo "generated: $FILES"
+du -sh "$FILES"
+mv "$FILES" "$BUILD_DIR"
+
+echo "--- ready ---"
+exit 0
Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/configure.in 2008-05-25 18:59:05 UTC (rev 18808)
@@ -102,7 +102,9 @@
dnl --- setup Objective-C ---
OBJC="${CC}"
-OBJCFLAGS="${CFLAGS}"
+if [ "x${OBJCFLAGS}" = x ]; then
+ OBJCFLAGS="${CFLAGS}"
+fi
OBJCDEPMODE="depmode=${CC}"
AC_SUBST(OBJC)
AC_SUBST(OBJCFLAGS)
@@ -1834,7 +1836,7 @@
ARCH_LIBS="$ARCH_DIR/macosx/cocoa/menu/libarchmacosxcocoamenu.a $ARCH_DIR/macosx/cocoa/dialog/libarchmacosxcocoadialog.a $ARCH_DIR/macosx/cocoa/libarchmacosxcocoa.a $ARCH_DIR/macosx/cocoa/view/libarchmacosxcocoaview.a $ARCH_DIR/macosx/libarchmacosx.a $ARCH_DIR/libarch.a $ARCH_LIBS"
ARCH_INCLUDES="-I$ARCH_SRC_DIR/macosx/cocoa/menu -I$ARCH_SRC_DIR/macosx/cocoa/dialog -I$ARCH_SRC_DIR/macosx/cocoa/view -I$ARCH_SRC_DIR/macosx/cocoa -I$ARCH_SRC_DIR $ARCH_INCLUDES"
ARCH_EXTRA_SUBDIR="macosx macosx/cocoa macosx/cocoa/view macosx/cocoa/menu macosx/cocoa/dialog"
- UI_LIBS="-framework Cocoa -framework OpenGL"
+ UI_LIBS="-framework Cocoa -framework OpenGL -framework Carbon"
UNIX_MACOSX_UITYPE=cocoa
else
ARCH_LIBS="$ARCH_DIR/macosx/libarchmacosx.a $ARCH_LIBS"
Modified: trunk/vice/data/C64/Makefile.am
===================================================================
--- trunk/vice/data/C64/Makefile.am 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/data/C64/Makefile.am 2008-05-25 18:59:05 UTC (rev 18808)
@@ -21,7 +21,8 @@
os2.vkm \
os2_sym.vkm \
osx_pos.vkm \
- osx_sym.vkm \
+ osx_sym_de.vkm \
+ osx_sym_us.vkm \
pc64.vpl \
ROdflt.vkm \
vice.vpl \
Modified: trunk/vice/data/C64/osx_pos.vkm
===================================================================
--- trunk/vice/data/C64/osx_pos.vkm 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/data/C64/osx_pos.vkm 2008-05-25 18:59:05 UTC (rev 18808)
@@ -21,15 +21,8 @@
# 2 left shift
# 4 right shift
# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
!CLEAR
!LSHIFT 1 7
@@ -42,7 +35,7 @@
3 2 5 8 /* F -> F */
4 3 5 8 /* H -> H */
5 3 2 8 /* G -> G */
-6 3 1 8 /* Y -> Y */
+6 1 4 8 /* Y -> Z */
7 2 7 8 /* X -> X */
8 2 4 8 /* C -> C */
9 3 7 8 /* V -> V */
@@ -52,7 +45,8 @@
13 1 1 8 /* W -> W */
14 1 6 8 /* E -> E */
15 2 1 8 /* R -> R */
-16 1 4 8 /* Z -> Z */
+
+16 3 1 8 /* Z -> Y */
17 2 6 8 /* T -> T */
18 7 0 8 /* 1 -> 1 */
19 7 3 8 /* 2 -> 2 */
@@ -68,6 +62,7 @@
29 4 3 8 /* 0 -> 0 */
30 6 1 8 /* Plus -> * */
31 4 6 8 /* O -> O */
+
32 3 6 8 /* U -> U */
33 5 6 8 /* "U -> @ */
34 4 1 8 /* I -> I */
@@ -84,23 +79,24 @@
45 4 7 8 /* N -> N */
46 4 4 8 /* M -> M */
47 5 4 8 /* . -> . */
+
48 7 2 8 /* TAB -> Ctrl */
49 7 4 8 /* Space -> Space */
-#50 -1 -1 0 /* <> -> (no key) */
+50 7 5 8 /* < > -> CBM */
51 0 0 8 /* Backspace -> Del */
52 6 4 4 /* Enter -> Right Shift */
53 7 7 8 /* ESC -> Run/Stop */
-
-#54 -1 -1 0 /* (no key) */
-#55 -1 -1 0 /* (no key) */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
56 1 7 2 /* Left Shift -> Left Shift */
#57 -1 -1 0 /* (no key) */
-58 7 5 8 /* Option -> CBM */
+58 7 5 8 /* Left Alt -> CBM */
59 7 2 8 /* Left Ctrl -> CBM */
-#60 -1 -1 0 /* (no key) */
-#61 -1 -1 0 /* (no key) */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
#62 -1 -1 0 /* (no key) */
-#63 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
#64 -1 -1 0 /* (no key) */
#65 -1 -1 0 /* Numpad . -> (no key) */
#66 -1 -1 0 /* &&& -> (no key) */
@@ -116,6 +112,7 @@
#76 -1 -1 0 /* Numpad Enter -> (no key) */
#77 -1 -1 0 /* &&& -> (no key) */
#78 -1 -1 0 /* Numpad - -> (no key) */
+
#82 -1 -1 0 /* Numpad 0 -> (no key) */
#83 -1 -1 0 /* Numpad 1 -> (no key) */
#84 -1 -1 0 /* Numpad 2 -> (no key) */
@@ -126,53 +123,25 @@
#89 -1 -1 0 /* Numpad 7 -> (no key) */
#91 -1 -1 0 /* Numpad 8 -> (no key) */
#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
96 0 6 8 /* F5 -> F5 */
97 0 6 1 /* F6 -> F6 */
98 0 3 8 /* F7 -> F7 */
99 0 5 8 /* F3 -> F3 */
100 0 3 1 /* F8 -> F8 */
-#101 -1 -1 0 /* F9 -> (no key) */
-#103 -1 -1 0 /* F11 -> (no key) */
-#109 -1 -1 0 /* F10 -> (no key) */
-#111 -1 -1 0 /* F12 -> (no key) */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
115 6 3 8 /* Home -> CLR/HOME */
116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
118 0 5 1 /* F4 -> F4 */
120 0 4 1 /* F2 -> F2 */
121 6 0 8 /* PgDown -> Pound */
122 0 4 8 /* F1 -> F1 */
123 0 2 1 /* Left -> CRSR LEFT */
-124 0 2 8 /* Right -> CRSR RIGHT */
-125 0 7 8 /* Down -> CRSR DOWN */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
126 0 7 1 /* Up -> CRSR UP */
-
-#
-# Joystick 1
-#
-#KP_0 -1 0
-#KP_1 -1 1
-#KP_2 -1 2
-#KP_3 -1 3
-#KP_4 -1 4
-#KP_5 -1 5
-#KP_6 -1 6
-#KP_7 -1 7
-#KP_8 -1 8
-#KP_9 -1 9
-
-#
-# Joystick 2
-#
-#w -2 7
-#e -2 8
-#r -2 9
-#s -2 4
-#d -2 5
-#f -2 6
-#x -2 1
-#c -2 2
-#v -2 3
-#space -2 0
-
-# Restore key mappings
-117 -3 0 /* Del -> RESTORE */
Deleted: trunk/vice/data/C64/osx_sym.vkm
===================================================================
--- trunk/vice/data/C64/osx_sym.vkm 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/data/C64/osx_sym.vkm 2008-05-25 18:59:05 UTC (rev 18808)
@@ -1,183 +0,0 @@
-# VICE keyboard mapping file
-#
-# A Keyboard map is read in as patch to the current map.
-#
-# File format:
-# - comment lines start with '#'
-# - keyword lines start with '!keyword'
-# - normal line has 'keysym/scancode row column shiftflag'
-#
-# Keywords and their lines are:
-# '!CLEAR' clear whole table
-# '!INCLUDE filename' read file as mapping file
-# '!LSHIFT row col' left shift keyboard row/column
-# '!RSHIFT row col' right shift keyboard row/column
-# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
-# '!UNDEF keysym' remove keysym from table
-#
-# Shiftflag can have the values:
-# 0 key is not shifted for this keysym
-# 1 key is shifted for this keysym
-# 2 left shift
-# 4 right shift
-# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
-
-!CLEAR
-!LSHIFT 1 7
-!RSHIFT 6 4
-!VSHIFT RSHIFT
-
-0 1 2 8 /* A -> A */
-1 1 5 8 /* S -> S */
-2 2 2 8 /* D -> D */
-3 2 5 8 /* F -> F */
-4 3 5 8 /* H -> H */
-5 3 2 8 /* G -> G */
-6 3 1 8 /* Y -> Y */
-7 2 7 8 /* X -> X */
-8 2 4 8 /* C -> C */
-9 3 7 8 /* V -> V */
-10 7 1 8 /* ^ -> Left Arrow */
-11 3 4 8 /* B -> B */
-12 7 6 8 /* Q -> Q */
-13 1 1 8 /* W -> W */
-14 1 6 8 /* E -> E */
-15 2 1 8 /* R -> R */
-16 1 4 8 /* Z -> Z */
-17 2 6 8 /* T -> T */
-18 7 0 8 /* 1 -> 1 */
-19 7 3 8 /* 2 -> 2 */
-20 1 0 8 /* 3 -> 3 */
-21 1 3 8 /* 4 -> 4 */
-22 2 3 8 /* 6 -> 6 */
-23 2 0 8 /* 5 -> 5 */
-24 5 3 8 /* ` -> Minus */
-25 4 0 8 /* 9 -> 9 */
-26 3 0 8 /* 7 -> 7 */
-27 5 0 8 /* \ss -> Plus */
-28 3 3 8 /* 8 -> 8 */
-29 4 3 8 /* 0 -> 0 */
-30 6 1 8 /* Plus -> * */
-31 4 6 8 /* O -> O */
-32 3 6 8 /* U -> U */
-33 5 6 8 /* "U -> @ */
-34 4 1 8 /* I -> I */
-35 5 1 8 /* P -> P */
-36 0 1 8 /* Return -> Return */
-37 5 2 8 /* L -> L */
-38 4 2 8 /* J -> J */
-39 6 2 8 /* "A -> ; */
-40 4 5 8 /* K -> K */
-41 5 5 8 /* "O -> : */
-42 6 5 8 /* Hash -> = */
-43 5 7 8 /* , -> , */
-44 6 7 8 /* Minus -> / */
-45 4 7 8 /* N -> N */
-46 4 4 8 /* M -> M */
-47 5 4 8 /* . -> . */
-48 7 2 8 /* TAB -> Ctrl */
-49 7 4 8 /* Space -> Space */
-#50 -1 -1 0 /* <> -> (no key) */
-51 0 0 8 /* Backspace -> Del */
-52 6 4 4 /* Enter -> Right Shift */
-53 7 7 8 /* ESC -> Run/Stop */
-
-#54 -1 -1 0 /* (no key) */
-#55 -1 -1 0 /* (no key) */
-56 1 7 2 /* Left Shift -> Left Shift */
-#57 -1 -1 0 /* (no key) */
-58 7 5 8 /* Option -> CBM */
-59 7 2 8 /* Left Ctrl -> CBM */
-#60 -1 -1 0 /* (no key) */
-#61 -1 -1 0 /* (no key) */
-#62 -1 -1 0 /* (no key) */
-#63 -1 -1 0 /* (no key) */
-#64 -1 -1 0 /* (no key) */
-#65 -1 -1 0 /* Numpad . -> (no key) */
-#66 -1 -1 0 /* &&& -> (no key) */
-#67 -1 -1 0 /* Numpad * -> (no key) */
-#68 -1 -1 0 /* (no key) */
-#69 -1 -1 0 /* Numpad + -> (no key) */
-#70 -1 -1 0 /* &&& -> (no key) */
-#71 -1 -1 0 /* Numpad Clear -> (no key) */
-#72 -1 -1 0 /* &&& -> (no key) */
-#73 -1 -1 0 /* &&& -> (no key) */
-#74 -1 -1 0 /* &&& -> (no key) */
-#75 -1 -1 0 /* Numpad / -> (no key) */
-#76 -1 -1 0 /* Numpad Enter -> (no key) */
-#77 -1 -1 0 /* &&& -> (no key) */
-#78 -1 -1 0 /* Numpad - -> (no key) */
-#82 -1 -1 0 /* Numpad 0 -> (no key) */
-#83 -1 -1 0 /* Numpad 1 -> (no key) */
-#84 -1 -1 0 /* Numpad 2 -> (no key) */
-#85 -1 -1 0 /* Numpad 3 -> (no key) */
-#86 -1 -1 0 /* Numpad 4 -> (no key) */
-#87 -1 -1 0 /* Numpad 5 -> (no key) */
-#88 -1 -1 0 /* Numpad 6 -> (no key) */
-#89 -1 -1 0 /* Numpad 7 -> (no key) */
-#91 -1 -1 0 /* Numpad 8 -> (no key) */
-#92 -1 -1 0 /* Numpad 9 -> (no key) */
-96 0 6 8 /* F5 -> F5 */
-97 0 6 1 /* F6 -> F6 */
-98 0 3 8 /* F7 -> F7 */
-99 0 5 8 /* F3 -> F3 */
-100 0 3 1 /* F8 -> F8 */
-#101 -1 -1 0 /* F9 -> (no key) */
-#103 -1 -1 0 /* F11 -> (no key) */
-#109 -1 -1 0 /* F10 -> (no key) */
-#111 -1 -1 0 /* F12 -> (no key) */
-115 6 3 8 /* Home -> CLR/HOME */
-116 6 6 8 /* PgUp -> Up Arrow */
-118 0 5 1 /* F4 -> F4 */
-120 0 4 1 /* F2 -> F2 */
-121 6 0 8 /* PgDown -> Pound */
-122 0 4 8 /* F1 -> F1 */
-123 0 2 1 /* Left -> CRSR LEFT */
-124 0 2 8 /* Right -> CRSR RIGHT */
-125 0 7 8 /* Down -> CRSR DOWN */
-126 0 7 1 /* Up -> CRSR UP */
-
-#
-# Joystick 1
-#
-#KP_0 -1 0
-#KP_1 -1 1
-#KP_2 -1 2
-#KP_3 -1 3
-#KP_4 -1 4
-#KP_5 -1 5
-#KP_6 -1 6
-#KP_7 -1 7
-#KP_8 -1 8
-#KP_9 -1 9
-
-123 -2 4 /* Left -> Joy2 LEFT */
-124 -2 6 /* Right -> Joy2 RIGHT */
-125 -2 2 /* Down -> Joy2 DOWN */
-126 -2 8 /* Up -> Joy2 UP */
-52 -2 0 /* Enter -> Joy2 BUTTON */
-#
-# Joystick 2
-#
-#w -2 7
-#e -2 8
-#r -2 9
-#s -2 4
-#d -2 5
-#f -2 6
-#x -2 1
-#c -2 2
-#v -2 3
-#space -2 0
-
-# Restore key mappings
-117 -3 0 /* Del -> RESTORE */
Copied: trunk/vice/data/C64/osx_sym_de.vkm (from rev 18806, tags/chris/v1.22.15-cocoa-port/data/C64/osx_sym_de.vkm)
===================================================================
--- trunk/vice/data/C64/osx_sym_de.vkm (rev 0)
+++ trunk/vice/data/C64/osx_sym_de.vkm 2008-05-25 18:59:05 UTC (rev 18808)
@@ -0,0 +1,154 @@
+# VICE keyboard mapping file
+#
+# A Keyboard map is read in as patch to the current map.
+#
+# File format:
+# - comment lines start with '#'
+# - keyword lines start with '!keyword'
+# - normal line has 'keysym/scancode row column shiftflag'
+#
+# Keywords and their lines are:
+# '!CLEAR' clear whole table
+# '!INCLUDE filename' read file as mapping file
+# '!LSHIFT row col' left shift keyboard row/column
+# '!RSHIFT row col' right shift keyboard row/column
+# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
+# '!UNDEF keysym' remove keysym from table
+#
+# Shiftflag can have the values:
+# 0 key is not shifted for this keysym
+# 1 key is shifted for this keysym
+# 2 left shift
+# 4 right shift
+# 8 key can be shifted or not with this keysym
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
+
+!CLEAR
+!LSHIFT 1 7
+!RSHIFT 6 4
+!VSHIFT RSHIFT
+
+0 1 2 8 /* A -> A */
+1 1 5 8 /* S -> S */
+2 2 2 8 /* D -> D */
+3 2 5 8 /* F -> F */
+4 3 5 8 /* H -> H */
+5 3 2 8 /* G -> G */
+6 3 1 8 /* Y -> Y */
+7 2 7 8 /* X -> X */
+8 2 4 8 /* C -> C */
+9 3 7 8 /* V -> V */
+10 7 1 8 /* ^ -> Left Arrow */
+11 3 4 8 /* B -> B */
+12 7 6 8 /* Q -> Q */
+13 1 1 8 /* W -> W */
+14 1 6 8 /* E -> E */
+15 2 1 8 /* R -> R */
+
+16 1 4 8 /* Z -> Z */
+17 2 6 8 /* T -> T */
+18 7 0 8 /* 1 -> 1 */
+19 7 3 8 /* 2 -> 2 */
+20 1 0 0 /* 3 -> 3 */
+21 1 3 8 /* 4 -> 4 */
+22 2 3 8 /* 6 -> 6 */
+23 2 0 8 /* 5 -> 5 */
+24 3 0 1 /* ` -> ´ ! */
+25 4 0 8 /* 9 -> 9 */
+26 3 0 32 /* 7 -> 7 !! */
+26 6 7 16 /* 7 -> / !! */
+27 6 7 1 /* \ss -> ? ! */
+28 3 3 8 /* 8 -> 8 */
+29 4 3 32 /* 0 -> 0 !! */
+29 6 5 16 /* 0 -> 0 !! */
+30 5 0 32 /* Plus -> + !! */
+30 6 1 16 /* Plus -> * !! */
+31 4 6 8 /* O -> O */
+
+32 3 6 8 /* U -> U */
+#33 5 6 8 /* "U -> ! */
+34 4 1 8 /* I -> I */
+35 5 1 8 /* P -> P */
+36 0 1 8 /* Return -> Return */
+37 5 2 8 /* L -> L */
+38 4 2 8 /* J -> J */
+#39 6 2 8 /* "A -> ! */
+40 4 5 8 /* K -> K */
+#41 5 5 8 /* "O -> ! */
+42 1 0 33 /* Hash -> # !! */
+42 3 0 1 /* Hash -> ' !! */
+43 5 7 32 /* , -> , !! */
+43 6 2 16 /* , -> ; !! */
+44 5 3 0 /* Minus -> Minus ! */
+45 4 7 8 /* N -> N */
+46 4 4 8 /* M -> M */
+47 5 4 32 /* . -> . !! */
+47 5 5 16 /* . -> : !! */
+
+48 7 2 8 /* TAB -> Ctrl */
+49 7 4 8 /* Space -> Space */
+50 5 7 33 /* < > -> < !! */
+50 5 4 1 /* < > -> > !! */
+51 0 0 8 /* Backspace -> Del */
+52 6 4 4 /* Enter -> Right Shift */
+53 7 7 8 /* ESC -> Run/Stop */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
+56 1 7 2 /* Left Shift -> Left Shift */
+#57 -1 -1 0 /* (no key) */
+58 7 5 8 /* Left Alt -> CBM */
+59 7 2 8 /* Left Ctrl -> CBM */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
+#62 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
+#64 -1 -1 0 /* (no key) */
+#65 -1 -1 0 /* Numpad . -> (no key) */
+#66 -1 -1 0 /* &&& -> (no key) */
+#67 -1 -1 0 /* Numpad * -> (no key) */
+#68 -1 -1 0 /* (no key) */
+#69 -1 -1 0 /* Numpad + -> (no key) */
+#70 -1 -1 0 /* &&& -> (no key) */
+#71 -1 -1 0 /* Numpad Clear -> (no key) */
+#72 -1 -1 0 /* &&& -> (no key) */
+#73 -1 -1 0 /* &&& -> (no key) */
+#74 -1 -1 0 /* &&& -> (no key) */
+#75 -1 -1 0 /* Numpad / -> (no key) */
+#76 -1 -1 0 /* Numpad Enter -> (no key) */
+#77 -1 -1 0 /* &&& -> (no key) */
+#78 -1 -1 0 /* Numpad - -> (no key) */
+
+#82 -1 -1 0 /* Numpad 0 -> (no key) */
+#83 -1 -1 0 /* Numpad 1 -> (no key) */
+#84 -1 -1 0 /* Numpad 2 -> (no key) */
+#85 -1 -1 0 /* Numpad 3 -> (no key) */
+#86 -1 -1 0 /* Numpad 4 -> (no key) */
+#87 -1 -1 0 /* Numpad 5 -> (no key) */
+#88 -1 -1 0 /* Numpad 6 -> (no key) */
+#89 -1 -1 0 /* Numpad 7 -> (no key) */
+#91 -1 -1 0 /* Numpad 8 -> (no key) */
+#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
+96 0 6 8 /* F5 -> F5 */
+97 0 6 1 /* F6 -> F6 */
+98 0 3 8 /* F7 -> F7 */
+99 0 5 8 /* F3 -> F3 */
+100 0 3 1 /* F8 -> F8 */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
+115 6 3 8 /* Home -> CLR/HOME */
+116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
+118 0 5 1 /* F4 -> F4 */
+120 0 4 1 /* F2 -> F2 */
+121 6 0 8 /* PgDown -> Pound */
+122 0 4 8 /* F1 -> F1 */
+123 0 2 1 /* Left -> CRSR LEFT */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
+126 0 7 1 /* Up -> CRSR UP */
Copied: trunk/vice/data/C64/osx_sym_us.vkm (from rev 18806, tags/chris/v1.22.15-cocoa-port/data/C64/osx_sym_us.vkm)
===================================================================
--- trunk/vice/data/C64/osx_sym_us.vkm (rev 0)
+++ trunk/vice/data/C64/osx_sym_us.vkm 2008-05-25 18:59:05 UTC (rev 18808)
@@ -0,0 +1,150 @@
+# VICE keyboard mapping file
+#
+# A Keyboard map is read in as patch to the current map.
+#
+# File format:
+# - comment lines start with '#'
+# - keyword lines start with '!keyword'
+# - normal line has 'keysym/scancode row column shiftflag'
+#
+# Keywords and their lines are:
+# '!CLEAR' clear whole table
+# '!INCLUDE filename' read file as mapping file
+# '!LSHIFT row col' left shift keyboard row/column
+# '!RSHIFT row col' right shift keyboard row/column
+# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
+# '!UNDEF keysym' remove keysym from table
+#
+# Shiftflag can have the values:
+# 0 key is not shifted for this keysym
+# 1 key is shifted for this keysym
+# 2 left shift
+# 4 right shift
+# 8 key can be shifted or not with this keysym
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
+
+!CLEAR
+!LSHIFT 1 7
+!RSHIFT 6 4
+!VSHIFT RSHIFT
+
+0 1 2 8 /* A -> A */
+1 1 5 8 /* S -> S */
+2 2 2 8 /* D -> D */
+3 2 5 8 /* F -> F */
+4 3 5 8 /* H -> H */
+5 3 2 8 /* G -> G */
+6 1 4 8 /* Z -> Z */
+7 2 7 8 /* X -> X ! */
+8 2 4 8 /* C -> C */
+9 3 7 8 /* V -> V */
+10 7 1 8 /* ^ -> Left Arrow */
+11 3 4 8 /* B -> B */
+12 7 6 8 /* Q -> Q */
+13 1 1 8 /* W -> W */
+14 1 6 8 /* E -> E */
+15 2 1 8 /* R -> R */
+
+16 3 1 8 /* Y -> Y ! */
+17 2 6 8 /* T -> T */
+18 7 0 8 /* 1 -> 1 */
+19 7 3 8 /* 2 -> 2 */
+20 1 0 8 /* 3 -> 3 */
+21 1 3 8 /* 4 -> 4 */
+22 2 3 8 /* 6 -> 6 */
+23 2 0 8 /* 5 -> 5 */
+24 6 5 32 /* = -> = ! */
+24 5 0 0 /* = -> + ! */
+25 4 0 8 /* 9 -> 9 */
+26 3 0 8 /* 7 -> 7 */
+27 5 3 0 /* - -> - ! */
+28 3 3 8 /* 8 -> 8 */
+29 4 3 8 /* 0 -> 0 */
+30 6 2 1 /* ] -> ] ! */
+31 4 6 8 /* O -> O */
+
+32 3 6 8 /* U -> U */
+33 5 5 1 /* [ -> [ ! */
+34 4 1 8 /* I -> I */
+35 5 1 8 /* P -> P */
+36 0 1 8 /* Return -> Return */
+37 5 2 8 /* L -> L */
+38 4 2 8 /* J -> J */
+39 3 0 33 /* ' -> ' ! */
+39 7 3 1 /* " -> " ! */
+40 4 5 8 /* K -> K */
+41 6 2 32 /* ; -> ; ! */
+41 5 5 16 /* ; -> : ! */
+42 6 6 8 /* \ -> Up Arrow ! */
+43 5 7 8 /* , -> , */
+44 6 7 8 /* / -> / */
+45 4 7 8 /* N -> N */
+46 4 4 8 /* M -> M */
+47 5 4 8 /* . -> . */
+
+48 7 2 8 /* TAB -> Ctrl */
+49 7 4 8 /* Space -> Space */
+50 7 5 8 /* < > -> CBM */
+51 0 0 8 /* Backspace -> Del */
+52 6 4 4 /* Enter -> Right Shift */
+53 7 7 8 /* ESC -> Run/Stop */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
+56 1 7 2 /* Left Shift -> Left Shift */
+#57 -1 -1 0 /* (no key) */
+58 7 5 8 /* Left Alt -> CBM */
+59 7 2 8 /* Left Ctrl -> CBM */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
+#62 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
+#64 -1 -1 0 /* (no key) */
+#65 -1 -1 0 /* Numpad . -> (no key) */
+#66 -1 -1 0 /* &&& -> (no key) */
+#67 -1 -1 0 /* Numpad * -> (no key) */
+#68 -1 -1 0 /* (no key) */
+#69 -1 -1 0 /* Numpad + -> (no key) */
+#70 -1 -1 0 /* &&& -> (no key) */
+#71 -1 -1 0 /* Numpad Clear -> (no key) */
+#72 -1 -1 0 /* &&& -> (no key) */
+#73 -1 -1 0 /* &&& -> (no key) */
+#74 -1 -1 0 /* &&& -> (no key) */
+#75 -1 -1 0 /* Numpad / -> (no key) */
+#76 -1 -1 0 /* Numpad Enter -> (no key) */
+#77 -1 -1 0 /* &&& -> (no key) */
+#78 -1 -1 0 /* Numpad - -> (no key) */
+
+#82 -1 -1 0 /* Numpad 0 -> (no key) */
+#83 -1 -1 0 /* Numpad 1 -> (no key) */
+#84 -1 -1 0 /* Numpad 2 -> (no key) */
+#85 -1 -1 0 /* Numpad 3 -> (no key) */
+#86 -1 -1 0 /* Numpad 4 -> (no key) */
+#87 -1 -1 0 /* Numpad 5 -> (no key) */
+#88 -1 -1 0 /* Numpad 6 -> (no key) */
+#89 -1 -1 0 /* Numpad 7 -> (no key) */
+#91 -1 -1 0 /* Numpad 8 -> (no key) */
+#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
+96 0 6 8 /* F5 -> F5 */
+97 0 6 1 /* F6 -> F6 */
+98 0 3 8 /* F7 -> F7 */
+99 0 5 8 /* F3 -> F3 */
+100 0 3 1 /* F8 -> F8 */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
+115 6 3 8 /* Home -> CLR/HOME */
+116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
+118 0 5 1 /* F4 -> F4 */
+120 0 4 1 /* F2 -> F2 */
+121 6 0 8 /* PgDown -> Pound */
+122 0 4 8 /* F1 -> F1 */
+123 0 2 1 /* Left -> CRSR LEFT */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
+126 0 7 1 /* Up -> CRSR UP */
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/src/ChangeLog 2008-05-25 18:59:05 UTC (rev 18808)
@@ -1,3 +1,82 @@
+2008-05-25 Christian Vogelgsang <ch...@vo...>
+
+ * arch/unix/archdep.[ch]: made archdep_pref_path const.
+
+ * arch/unix/macosx/make-bindist.sh, arch/unix/macosx/Info.plist:
+ added crt file format. use new icons for Cocoa port.
+
+ * arch/unix/macosx/VICE.xcodeproj/project.pbxproj: added VICE
+ XCode project to manage nib files more easily
+
+ * arch/unix/macosx/cocoa/main.m: store preferences in
+ ~/Library/Preferences/org.viceteam.<emu> now
+
+ * arch/unix/macosx/cocoa/uimon.m,
+ arch/unix/macosx/cocoa/console.m,
+ arch/unix/macosx/cocoa/menu/c64machinecontroller.m: deprecated
+ NSString calls removed
+
+ * arch/unix/macosx/cocoa/kbd.h: added cocoa sym_de keymap
+
+ * arch/unix/macosx/cocoa/videoarch.h,
+ arch/unix/macosx/cocoa/viceapplication.h,
+ arch/unix/macosx/cocoa/vicemachine.h,
+ arch/unix/macosx/cocoa/video.m,
+ arch/unix/macosx/cocoa/vicemachine.m: added canvasId to manage
+ canvas ptr on App side
+
+ * arch/unix/macosx/cocoa/kbd.m: added missing include
+
+ * arch/unix/macosx/cocoa/fullscreen.m: removed obsolete function
+
+ * arch/unix/macosx/cocoa/view/joystickview.m,
+ arch/unix/macosx/cocoa/view/keypressview.m: removed compile
+ warning
+
+ * arch/unix/macosx/cocoa/view/consolewindow.m: fixed output bug
+
+ * arch/unix/macosx/cocoa/view/viceglview.[hm]: added auto hide
+ mouse and menu
+
+ * arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.[hm]:
+ added resource methods
+
+ * arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.[hm]:
+ rewrote drive settings UI
+
+ * arch/unix/macosx/cocoa/dialog/resourcetreeitem.[hm],
+ arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.[hm]:
+ added resource editor
+
+ * arch/unix/macosx/cocoa/dialog/printersettingswindowcontroller.[hm]:
+ added printer settings UI
+
+ * arch/unix/macosx/cocoa/dialog/soundsettingswindowcontroller.[hm]:
+ added sound settings UI
+
+ * arch/unix/macosx/cocoa/dialog/iecdrivesettingswindowcontroller.[hm]:
+ added IEC drive settings UI
+
+ * arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.[hm]:
+ added record media UI
+
+ * arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.[hm]:
+ added keyboard settings UI
+
+ * arch/unix/macosx/cocoa/menu/viceappcontroller.[hm],
+ arch/unix/macosx/cocoa/menu/c64controller.[hm]: added new UI
+ dialogs
+
+ * arch/unix/macosx/cocoa/menu/vicemachinecontroller.[hm]: added
+ machine control functions for new UI features
+
+ * arch/unix/macosx/Resources/English.lproj/*: added nib files
+ for new UI
+
+ * arch/unix/macosx/Makefile.am,
+ arch/unix/macosx/Resources/Makefile.am,
+ arch/unix/macosx/cocoa/dialog/Makefile.am: added new files
+
2008-05-24 Marco van den Heuvel <bla...@ya...>
* Makefile.am: Added a '@' in front of the 'make install' echo.
Modified: trunk/vice/src/arch/unix/archdep.c
===================================================================
--- trunk/vice/src/arch/unix/archdep.c 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/src/arch/unix/archdep.c 2008-05-25 18:59:05 UTC (rev 18808)
@@ -61,7 +61,7 @@
static char *boot_path = NULL;
/* alternate storage of preferences */
-char *archdep_pref_path = NULL; /* NULL -> use home_path + ".vice" */
+const char *archdep_pref_path = NULL; /* NULL -> use home_path + ".vice" */
int archdep_init(int *argc, char **argv)
{
Modified: trunk/vice/src/arch/unix/archdep.h
===================================================================
--- trunk/vice/src/arch/unix/archdep.h 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/src/arch/unix/archdep.h 2008-05-25 18:59:05 UTC (rev 18808)
@@ -106,7 +106,7 @@
extern const char *archdep_home_path(void);
/* set this path to customize the preference storage */
-extern char *archdep_pref_path;
+extern const char *archdep_pref_path;
/* Define the default system directory (where the ROMs are). */
#ifdef __NetBSD__
Modified: trunk/vice/src/arch/unix/macosx/Info.plist
===================================================================
--- trunk/vice/src/arch/unix/macosx/Info.plist 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/src/arch/unix/macosx/Info.plist 2008-05-25 18:59:05 UTC (rev 18808)
@@ -7,7 +7,7 @@
<key>CFBundleGetInfoString</key>
<string>XNAMEX XVERSIONX (C)2008 The VICE Team</string>
<key>CFBundleIconFile</key>
- <string>VICE.icns</string>
+ <string>XNAMEX.icns</string>
<key>CFBundleIdentifier</key>
<string>org.viceteam.XNAMEX</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: trunk/vice/src/arch/unix/macosx/Makefile.am
===================================================================
--- trunk/vice/src/arch/unix/macosx/Makefile.am 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/src/arch/unix/macosx/Makefile.am 2008-05-25 18:59:05 UTC (rev 18808)
@@ -24,7 +24,6 @@
joy.h
EXTRA_DIST = \
- VICE.icns \
Info.plist \
make-bindist.sh \
x11-launcher.sh \
Modified: trunk/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/classes.nib
===================================================================
--- trunk/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/classes.nib 2008-05-25 18:37:11 UTC (rev 18807)
+++ trunk/vice/src/arch/unix/macosx/Resources/English.lproj/DriveSettings.nib/classes.nib 2008-05-25 18:59:05 UTC (rev 18808)
@@ -1,66 +1,81 @@
-{
- IBClasses = (
- {
- ACTIONS = {
- changedDriveExpansion2000 = id;
- changedDriveExpansion4000 = id;
- changedDriveExpansion6000 = id;
- changedDriveExpansion8000 = id;
- changedDriveExpansionA000 = id;
- changedDriveType = id;
- changedIdleMethod = id;
- changedTrackHandling = id;
- toggledParallelCable = id;
- };
- CLASS = DriveSettingsWindowController;
- LANGUAGE = ObjC;
- OUTLETS = {
- "driveExpansion0_2000" = NSButton;
- "driveExpansion0_4000" = NSButton;
- "driveExpansion0_6000" = NSButton;
- "driveExpansion0_8000" = NSButton;
- "driveExpansion0_A000" = NSButton;
- "driveExpansion1_2000" = NSButton;
- "driveExpansion1_4000" = NSButton;
- "driveExpansion1_6000" = NSButton;
- "driveExpansion1_8000" = NSButton;
- "driveExpansion1_A000" = NSButton;
- "driveExpansion2_2000" = NSButton;
- "driveExpansion2_4000" = NSButton;
- "driveExpansion2_6000" = NSButton;
- "driveExpansion2_8000" = NSButton;
- "driveExpansion2_A000" = NSButton;
- "driveExpansion3_2000" = NSButton;
- "driveExpansion3_4000" = NSButton;
- "driveExpansion3_6000" = NSButton;
- "driveExpansion3_8000" = NSButton;
- "driveExpansion3_A000" = NSButton;
- driveType0 = NSMatrix;
- driveType1 = NSMatrix;
- driveType2 = NSMatrix;
- driveType3 = NSMatrix;
- idleMethod0 = NSMatrix;
- idleMethod1 = NSMatrix;
- idleMethod2 = NSMatrix;
- idleMethod3 = NSMatrix;
- parallelCable0 = NSButton;
- parallelCable1 = NSButton;
- parallelCable2 = NSButton;
- parallelCable3 = NSButton;
- tabView = NSTabView;
- trackHandling0 = NSMatrix;
- trackHandling1 = NSMatrix;
- trackHandling2 = NSMatrix;
- trackHandling3 = NSMatrix;
- };
- SUPERCLASS = VICEResourceWindowController;
- },
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {
- CLASS = VICEResourceWindowController;
- LANGUAGE = ObjC;
- SUPERCLASS = NSWindowController;
- }
- );
- IBVersion = 1;
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "" rel="nofollow">http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>CLASS</key>
+ <string>VICEResourceWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSWindowController</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>changedDriveExpansion2000</key>
+ <string>id</string>
+ <key>changedDriveExpansion4000</key>
+ <string>id</string>
+ <key>changedDriveExpansion6000</key>
+ <string>id</string>
+ <key>changedDriveExpansion8000</key>
+ <string>id</string>
+ <key>changedDriveExpansionA000</key>
+ <string>id</string>
+ <key>changedDriveType</key>
+ <string>id</string>
+ <key>changedIdleMethod</key>
+ <string>id</string>
+ <key>changedTrackHandling</key>
+ <string>id</string>
+ <key>toggleDrive</key>
+ <string>id</string>
+ <key>toggledParallelCable</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>DriveSettingsWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>driveChooser</key>
+ <string>NSSegmentedControl</string>
+ <key>driveExpansion_2000</key>
+ <string>NSButton</string>
+ <key>driveExpansion_4000</key>
+ <string>NSButton</string>
+ <key>driveExpansion_6000</key>
+ <string>NSButton</string>
+ <key>driveExpansion_8000</key>
+ <string>NSButton</string>
+ <key>driveExpansion_A000</key>
+ <string>NSButton</string>
+ <key>driveType</key>
+ <string>NSMatrix</string>
+ <key>idleMethod</key>
+ <string>NSMatrix</string>
+ <key>parallelCable</key>
+ <string>NSButton</string>
+ <key>trackHandling</key>
+ <string>NSMatrix</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>VICEResourceWindowController</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Modified: trunk/vice/src/arc...
[truncated message content] |
|
From: <st...@us...> - 2008-05-25 18:37:05
|
Revision: 18807
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18807&view=rev
Author: strik
Date: 2008-05-25 11:37:11 -0700 (Sun, 25 May 2008)
Log Message:
-----------
2008-05-24 Marco van den Heuvel <bla...@ya...>
* Makefile.am: Added a '@' in front of the 'make install' echo.
2008-05-24 Marco van den Heuvel <bla...@ya...>
* joystick.c, keyboard.c: Added #ifdef COMMON_KBD around common
keyboard specific elements.
* vic20/vic20cartridge.c, c64/cart/c64cart.c,
monitor/mon_parse.c, monitor/mon_command.c, monitor/mon_parse.h,
monitor/mon_lex.c, monitor/mon_parse.y, monitor/mon_lex.l,
monitor/mon_memory.c, monitor/montypes.h, monitor/monitor.c,
monitor/mon_file.c, monitor/mon_file.h, translate.txt,
monitor.h: Added most of the new VICEplus monitor features, as
provided by Hannu Nuotio <han...@tu...> and Daniel Kahlin
<da...@ka...>.
* network.c, sounddrv/soundallegro.c, sounddrv/soundvoc.c,
sounddrv/soundmmos2.c, sounddrv/soundwav.c, sounddrv/soundmp3.c,
sounddrv/soundarts.c, c64/c64io.c, c64/mmc64.c, tape/tape.c,
translate.c, fsdevice/fsdevice-close.c, crtc/crtc.c,
drive/rotation.c, arch/amigaos/intl.c, arch/amigaos/video.c,
arch/amigaos/mui/uivideoc128.c, arch/amigaos/mui/mui.h,
arch/amigaos/mui/uisnapshot.c, arch/amigaos/catweaselmkiii.c,
arch/amigaos/joyai.c, arch/amigaos/screen-shot.c,
arch/riscos/videoarch.h, arch/riscos/ui.c, arch/riscos/video.c,
arch/riscos/spritedrv.c, arch/win32/intl.c, arch/win32/ui.c,
arch/win32/watcom/monitor.tgt, arch/win32/watcom/vic20.tgt,
arch/win32/watcom/plus4.tgt, arch/win32/watcom/c64.tgt,
arch/os2/archdep.c, arch/os2/fullscr.c, arch/os2/ui.c,
arch/os2/dialogs/dlg-joystick.c, arch/os2/dialogs/menubar.c,
arch/os2/dialogs/dlg-fileio.c, arch/os2/dialogs/dlg-drive.c,
arch/os2/dialogs/dlg-cmdopt.c, arch/os2/dialogs/dlg-monitor.c,
arch/os2/vsidui.c, arch/os2/video.c, arch/os2/kbd/parse.c,
arch/os2/uimon.c, arch/os2/blockdev.c, arch/unix/joy.h,
arch/unix/gp2x/vic20ui.c, arch/unix/gp2x/minimal.c,
arch/unix/gp2x/vkeyboard_gp2x.c, arch/unix/gp2x/c64ui.c,
arch/unix/gp2x/input_gp2x.c, arch/unix/gp2x/audio_gp2x.c,
arch/unix/gp2x/vsidui.c, arch/unix/gp2x/input_gp2x.h,
arch/unix/gp2x/plus4ui.c, arch/unix/gp2x/video.c,
arch/unix/gp2x/c128ui.c, arch/unix/gp2x/prefs_gp2x.c,
arch/unix/gp2x/uiarch.h, arch/unix/gp2x/cbm2ui.c,
arch/unix/gp2x/petui.c, arch/unix/gui/vsidui.c,
arch/unix/x11/xaw/x11video.c,
arch/unix/x11/xaw/widgets/FileSel.c,
arch/unix/x11/gnome/uipalcontrol.c,
arch/unix/x11/gnome/uicolor.c, arch/msdos/joy.c,
arch/msdos/console.c, arch/msdos/uiperipherial.c,
arch/msdos/uinetplay.c, arch/msdos/video.c, arch/msdos/petui.c,
arch/msdos/ui.c, arch/msdos/plus4ui.c, arch/msdos/cbm2ui.c,
arch/msdos/uijoystick.c, zfile.c, cartconv.c: Fixed some
warnings and other issues.
* arch/unix/readline/editline2.c, arch/unix/readline/editline.h,
arch/unix/readline/sysunix.c, arch/unix/readline/complete.c,
arch/unix/readline/editline.c: Updated the prototypes.
Modified Paths:
--------------
trunk/vice/Makefile.am
trunk/vice/src/ChangeLog
trunk/vice/src/arch/amigaos/catweaselmkiii.c
trunk/vice/src/arch/amigaos/intl.c
trunk/vice/src/arch/amigaos/joyai.c
trunk/vice/src/arch/amigaos/mui/mui.h
trunk/vice/src/arch/amigaos/mui/uisnapshot.c
trunk/vice/src/arch/amigaos/mui/uivideoc128.c
trunk/vice/src/arch/amigaos/screen-shot.c
trunk/vice/src/arch/amigaos/video.c
trunk/vice/src/arch/msdos/cbm2ui.c
trunk/vice/src/arch/msdos/console.c
trunk/vice/src/arch/msdos/joy.c
trunk/vice/src/arch/msdos/petui.c
trunk/vice/src/arch/msdos/plus4ui.c
trunk/vice/src/arch/msdos/ui.c
trunk/vice/src/arch/msdos/uijoystick.c
trunk/vice/src/arch/msdos/uinetplay.c
trunk/vice/src/arch/msdos/uiperipherial.c
trunk/vice/src/arch/msdos/video.c
trunk/vice/src/arch/os2/archdep.c
trunk/vice/src/arch/os2/blockdev.c
trunk/vice/src/arch/os2/dialogs/dlg-cmdopt.c
trunk/vice/src/arch/os2/dialogs/dlg-drive.c
trunk/vice/src/arch/os2/dialogs/dlg-fileio.c
trunk/vice/src/arch/os2/dialogs/dlg-joystick.c
trunk/vice/src/arch/os2/dialogs/dlg-monitor.c
trunk/vice/src/arch/os2/dialogs/menubar.c
trunk/vice/src/arch/os2/fullscr.c
trunk/vice/src/arch/os2/kbd/parse.c
trunk/vice/src/arch/os2/ui.c
trunk/vice/src/arch/os2/uimon.c
trunk/vice/src/arch/os2/video.c
trunk/vice/src/arch/os2/vsidui.c
trunk/vice/src/arch/riscos/spritedrv.c
trunk/vice/src/arch/riscos/ui.c
trunk/vice/src/arch/riscos/video.c
trunk/vice/src/arch/riscos/videoarch.h
trunk/vice/src/arch/unix/gp2x/audio_gp2x.c
trunk/vice/src/arch/unix/gp2x/c128ui.c
trunk/vice/src/arch/unix/gp2x/c64ui.c
trunk/vice/src/arch/unix/gp2x/cbm2ui.c
trunk/vice/src/arch/unix/gp2x/input_gp2x.c
trunk/vice/src/arch/unix/gp2x/input_gp2x.h
trunk/vice/src/arch/unix/gp2x/minimal.c
trunk/vice/src/arch/unix/gp2x/petui.c
trunk/vice/src/arch/unix/gp2x/plus4ui.c
trunk/vice/src/arch/unix/gp2x/prefs_gp2x.c
trunk/vice/src/arch/unix/gp2x/uiarch.h
trunk/vice/src/arch/unix/gp2x/vic20ui.c
trunk/vice/src/arch/unix/gp2x/video.c
trunk/vice/src/arch/unix/gp2x/vkeyboard_gp2x.c
trunk/vice/src/arch/unix/gp2x/vsidui.c
trunk/vice/src/arch/unix/gui/vsidui.c
trunk/vice/src/arch/unix/joy.h
trunk/vice/src/arch/unix/readline/complete.c
trunk/vice/src/arch/unix/readline/editline.c
trunk/vice/src/arch/unix/readline/editline.h
trunk/vice/src/arch/unix/readline/editline2.c
trunk/vice/src/arch/unix/readline/sysunix.c
trunk/vice/src/arch/unix/x11/gnome/uicolor.c
trunk/vice/src/arch/unix/x11/gnome/uipalcontrol.c
trunk/vice/src/arch/unix/x11/xaw/widgets/FileSel.c
trunk/vice/src/arch/unix/x11/xaw/x11video.c
trunk/vice/src/arch/win32/intl.c
trunk/vice/src/arch/win32/ui.c
trunk/vice/src/arch/win32/watcom/c64.tgt
trunk/vice/src/arch/win32/watcom/monitor.tgt
trunk/vice/src/arch/win32/watcom/plus4.tgt
trunk/vice/src/arch/win32/watcom/vic20.tgt
trunk/vice/src/c64/c64io.c
trunk/vice/src/c64/cart/c64cart.c
trunk/vice/src/c64/mmc64.c
trunk/vice/src/cartconv.c
trunk/vice/src/crtc/crtc.c
trunk/vice/src/drive/rotation.c
trunk/vice/src/fsdevice/fsdevice-close.c
trunk/vice/src/joystick.c
trunk/vice/src/keyboard.c
trunk/vice/src/monitor/mon_command.c
trunk/vice/src/monitor/mon_file.c
trunk/vice/src/monitor/mon_file.h
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.h
trunk/vice/src/monitor/mon_parse.y
trunk/vice/src/monitor/monitor.c
trunk/vice/src/monitor/montypes.h
trunk/vice/src/monitor.h
trunk/vice/src/network.c
trunk/vice/src/sounddrv/soundallegro.c
trunk/vice/src/sounddrv/soundarts.c
trunk/vice/src/sounddrv/soundmmos2.c
trunk/vice/src/sounddrv/soundmp3.c
trunk/vice/src/sounddrv/soundvoc.c
trunk/vice/src/sounddrv/soundwav.c
trunk/vice/src/tape/tape.c
trunk/vice/src/translate.c
trunk/vice/src/translate.txt
trunk/vice/src/vic20/vic20cartridge.c
trunk/vice/src/zfile.c
Modified: trunk/vice/Makefile.am
===================================================================
--- trunk/vice/Makefile.am 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/Makefile.am 2008-05-25 18:37:11 UTC (rev 18807)
@@ -147,7 +147,7 @@
endif
@MAKE_BINDIST_TRUE@installvice:
-@MAKE_BINDIST_TRUE@ echo this platform doesn\'t use \"make install\", use \"make bindist\" instead
+@MAKE_BINDIST_TRUE@ @echo this platform doesn\'t use \"make install\", use \"make bindist\" instead
@MAKE_BINDIST_FALSE@installvice: install-recursive
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/ChangeLog 2008-05-25 18:37:11 UTC (rev 18807)
@@ -1,3 +1,61 @@
+2008-05-24 Marco van den Heuvel <bla...@ya...>
+
+ * Makefile.am: Added a '@' in front of the 'make install' echo.
+
+2008-05-24 Marco van den Heuvel <bla...@ya...>
+
+ * joystick.c, keyboard.c: Added #ifdef COMMON_KBD around common
+ keyboard specific elements.
+
+ * vic20/vic20cartridge.c, c64/cart/c64cart.c,
+ monitor/mon_parse.c, monitor/mon_command.c, monitor/mon_parse.h,
+ monitor/mon_lex.c, monitor/mon_parse.y, monitor/mon_lex.l,
+ monitor/mon_memory.c, monitor/montypes.h, monitor/monitor.c,
+ monitor/mon_file.c, monitor/mon_file.h, translate.txt,
+ monitor.h: Added most of the new VICEplus monitor features, as
+ provided by Hannu Nuotio <han...@tu...> and Daniel Kahlin
+ <da...@ka...>.
+
+ * network.c, sounddrv/soundallegro.c, sounddrv/soundvoc.c,
+ sounddrv/soundmmos2.c, sounddrv/soundwav.c, sounddrv/soundmp3.c,
+ sounddrv/soundarts.c, c64/c64io.c, c64/mmc64.c, tape/tape.c,
+ translate.c, fsdevice/fsdevice-close.c, crtc/crtc.c,
+ drive/rotation.c, arch/amigaos/intl.c, arch/amigaos/video.c,
+ arch/amigaos/mui/uivideoc128.c, arch/amigaos/mui/mui.h,
+ arch/amigaos/mui/uisnapshot.c, arch/amigaos/catweaselmkiii.c,
+ arch/amigaos/joyai.c, arch/amigaos/screen-shot.c,
+ arch/riscos/videoarch.h, arch/riscos/ui.c, arch/riscos/video.c,
+ arch/riscos/spritedrv.c, arch/win32/intl.c, arch/win32/ui.c,
+ arch/win32/watcom/monitor.tgt, arch/win32/watcom/vic20.tgt,
+ arch/win32/watcom/plus4.tgt, arch/win32/watcom/c64.tgt,
+ arch/os2/archdep.c, arch/os2/fullscr.c, arch/os2/ui.c,
+ arch/os2/dialogs/dlg-joystick.c, arch/os2/dialogs/menubar.c,
+ arch/os2/dialogs/dlg-fileio.c, arch/os2/dialogs/dlg-drive.c,
+ arch/os2/dialogs/dlg-cmdopt.c, arch/os2/dialogs/dlg-monitor.c,
+ arch/os2/vsidui.c, arch/os2/video.c, arch/os2/kbd/parse.c,
+ arch/os2/uimon.c, arch/os2/blockdev.c, arch/unix/joy.h,
+ arch/unix/gp2x/vic20ui.c, arch/unix/gp2x/minimal.c,
+ arch/unix/gp2x/vkeyboard_gp2x.c, arch/unix/gp2x/c64ui.c,
+ arch/unix/gp2x/input_gp2x.c, arch/unix/gp2x/audio_gp2x.c,
+ arch/unix/gp2x/vsidui.c, arch/unix/gp2x/input_gp2x.h,
+ arch/unix/gp2x/plus4ui.c, arch/unix/gp2x/video.c,
+ arch/unix/gp2x/c128ui.c, arch/unix/gp2x/prefs_gp2x.c,
+ arch/unix/gp2x/uiarch.h, arch/unix/gp2x/cbm2ui.c,
+ arch/unix/gp2x/petui.c, arch/unix/gui/vsidui.c,
+ arch/unix/x11/xaw/x11video.c,
+ arch/unix/x11/xaw/widgets/FileSel.c,
+ arch/unix/x11/gnome/uipalcontrol.c,
+ arch/unix/x11/gnome/uicolor.c, arch/msdos/joy.c,
+ arch/msdos/console.c, arch/msdos/uiperipherial.c,
+ arch/msdos/uinetplay.c, arch/msdos/video.c, arch/msdos/petui.c,
+ arch/msdos/ui.c, arch/msdos/plus4ui.c, arch/msdos/cbm2ui.c,
+ arch/msdos/uijoystick.c, zfile.c, cartconv.c: Fixed some
+ warnings and other issues.
+
+ * arch/unix/readline/editline2.c, arch/unix/readline/editline.h,
+ arch/unix/readline/sysunix.c, arch/unix/readline/complete.c,
+ arch/unix/readline/editline.c: Updated the prototypes.
+
2008-05-19 Spiro Trikaliotis <spi...@gm...>
* resid/configure, resid/depcomp, resid/config.guess,
Modified: trunk/vice/src/arch/amigaos/catweaselmkiii.c
===================================================================
--- trunk/vice/src/arch/amigaos/catweaselmkiii.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/catweaselmkiii.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -113,7 +113,7 @@
int catweaselmkiii_open(void)
{
static int atexitinitialized = 0;
- int i;
+ unsigned int i;
if (atexitinitialized) {
catweaselmkiii_close();
@@ -190,7 +190,7 @@
int catweaselmkiii_close(void)
{
- int i;
+ unsigned int i;
/* mute all sids */
memset(sidbuf, 0, sizeof(sidbuf));
Modified: trunk/vice/src/arch/amigaos/intl.c
===================================================================
--- trunk/vice/src/arch/amigaos/intl.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/intl.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -4802,7 +4802,7 @@
static char *intl_get_string_by_id(int id)
{
- int k;
+ unsigned int k;
for (k = 0; k < countof(intl_string_table); k++)
{
@@ -4814,7 +4814,7 @@
char *intl_translate_text(int en_resource)
{
- int i;
+ unsigned int i;
for (i = 0; i < countof(intl_translate_text_table); i++)
{
@@ -4840,7 +4840,7 @@
void intl_init(void)
{
- int i,j;
+ unsigned int i,j;
for (i = 0; i < countof(language_table); i++)
{
Modified: trunk/vice/src/arch/amigaos/joyai.c
===================================================================
--- trunk/vice/src/arch/amigaos/joyai.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/joyai.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -312,7 +312,7 @@
{
keysym_type *keysym = (joy == 2) ? keysym_2 : keysym_1;
char *tmp, txt[256];
- int i;
+ unsigned int i;
sprintf(txt, "JOYAI%d_ID", joy);
tmp = NULL;
@@ -335,7 +335,7 @@
{
keysym_type *keysym = (joy == 2) ? keysym_2 : keysym_1;
char tmp[256], txt[256];
- int i;
+ unsigned int i;
sprintf(txt, "JOYAI%d_ID", joy);
sprintf(tmp, "%lu", joy_id[joy-1]);
@@ -400,7 +400,7 @@
static void ai_attach(void)
{
- int i;
+ unsigned int i;
for (i=0; i<2; i++) {
get_cfg(i+1);
if ((CTX != NULL) && (joy_id[i] != -1)) {
@@ -553,7 +553,8 @@
static void update_inputs(ULONG ID)
{
char name[256];
- int i, num, offset;
+ unsigned int i;
+ int num, offset;
for (i=0; i<inputs.count; i++) {
if (inputs.names[i] != NULL) {
@@ -616,7 +617,8 @@
static int offset_to_index(int offset)
{
- int i;
+ unsigned int i;
+
for (i=0; i<inputs.count; i++) {
if ((inputs.types[i] != TYPE_NONE) && (inputs.offsets[i] == offset)) {
return i;
@@ -643,7 +645,8 @@
static int offset_to_active(int type, int offset)
{
- int i;
+ unsigned int i;
+
for (i=0; i<inputs.count; i++) {
if ((inputs.types[i] == type) && (inputs.offsets[i] == offset)) {
return i;
@@ -747,7 +750,7 @@
End;
if (app) {
- int i;
+ unsigned int i;
DoMethod(window,
MUIM_Notify, MUIA_Window_CloseRequest, TRUE,
@@ -824,7 +827,7 @@
}
if (app) {
- int i;
+ unsigned int i;
set(window, MUIA_Window_Open, TRUE);
while (running) {
unsigned long retval = DoMethod(app, MUIM_Application_Input, &signals);
@@ -898,7 +901,8 @@
}
if (AIN_ReadDevice(CTX, ai_handle[joy-1], &ptr) == TRUE) {
- int i, *data = ptr;
+ unsigend int i, *data = ptr;
+
for (i=0; i<NUM_KEYSYM; i++) {
switch (keysym[i].type) {
@@ -998,7 +1002,7 @@
{
BYTE value = 0;
keysym_type *keysym = (joy == 2) ? keysym_2 : keysym_1;
- int i;
+ unsigend int i;
for (i=0; i<NUM_KEYSYM; i++) {
if ((keysym[i].type == TYPE_NONE) && (keysym[i].rawkey == kcode)) {
Modified: trunk/vice/src/arch/amigaos/mui/mui.h
===================================================================
--- trunk/vice/src/arch/amigaos/mui/mui.h 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/mui/mui.h 2008-05-25 18:37:11 UTC (rev 18807)
@@ -47,6 +47,9 @@
#ifdef AMIGA_MORPHOS
#include <proto/alib.h> /* for DoMethod */
#endif
+#ifdef AMIGA_M68K
+#include <clib/alib_protos.h> /* for DoMethod */
+#endif
#ifdef AMIGA_AROS
#define MUI_OBSOLETE
#endif
Modified: trunk/vice/src/arch/amigaos/mui/uisnapshot.c
===================================================================
--- trunk/vice/src/arch/amigaos/mui/uisnapshot.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/mui/uisnapshot.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -60,7 +60,7 @@
static APTR build_gui(void)
{
- APTR app, ui, ok, browse_button, cancel, label;
+ APTR app, ui, ok, browse_button, cancel;
#ifdef AMIGA_MORPHOS
static const struct Hook BrowseFileHook = { { NULL,NULL },(VOID *)HookEntry,(VOID *)Browse, NULL};
Modified: trunk/vice/src/arch/amigaos/mui/uivideoc128.c
===================================================================
--- trunk/vice/src/arch/amigaos/mui/uivideoc128.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/mui/uivideoc128.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -111,7 +111,7 @@
static const struct Hook BrowseVDCFileHook = { { NULL,NULL },(VOID *)HookEntry,(VOID *)BrowseVDC, NULL};
#else
static const struct Hook BrowseVICIIFileHook = { { NULL,NULL },(VOID *)BrowseVICII,NULL,NULL };
- static const struct Hook BrowseVDCFileHook = { { NULL,NULL },(VOID *)BrowseVICII,NULL,NULL };
+ static const struct Hook BrowseVDCFileHook = { { NULL,NULL },(VOID *)BrowseVDC,NULL,NULL };
#endif
app = mui_get_app();
Modified: trunk/vice/src/arch/amigaos/screen-shot.c
===================================================================
--- trunk/vice/src/arch/amigaos/screen-shot.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/screen-shot.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -113,7 +113,6 @@
void ui_screenshot_dialog(video_canvas_t *canvas)
{
int format;
- char *name;
char choices[100]="";
strcat(choices,"BMP|");
Modified: trunk/vice/src/arch/amigaos/video.c
===================================================================
--- trunk/vice/src/arch/amigaos/video.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/amigaos/video.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -515,7 +515,9 @@
}
}
else {
+#if defined(HAVE_PROTO_CYBERGRAPHICS_H) && defined(HAVE_XVIDEO)
reopenwindow:
+#endif
/* if window already is open, just resize it, otherwise, open it */
if (canvas->os->window != NULL) {
ChangeWindowBox(canvas->os->window,
@@ -951,6 +953,7 @@
return c;
}
+#ifdef HAVE_PROTO_CYBERGRAPHICS_H
static int makecol_BGR565BE(int r, int g, int b)
{
int c = ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3);
@@ -962,6 +965,7 @@
int c = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
return c;
}
+#endif
static int makecol_BGR555BE(int r, int g, int b)
{
@@ -1110,7 +1114,7 @@
struct palette_s *palette)
{
int (*makecol)(int r, int g, int b);
- int i;
+ unsigned int i;
int col;
canvas->palette = palette;
Modified: trunk/vice/src/arch/msdos/cbm2ui.c
===================================================================
--- trunk/vice/src/arch/msdos/cbm2ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/cbm2ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "cbm2ui.h"
#include "menudefs.h"
Modified: trunk/vice/src/arch/msdos/console.c
===================================================================
--- trunk/vice/src/arch/msdos/console.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/console.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -33,6 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <string.h>
#include "console.h"
#include "lib.h"
Modified: trunk/vice/src/arch/msdos/joy.c
===================================================================
--- trunk/vice/src/arch/msdos/joy.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/joy.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -40,9 +40,6 @@
#include "types.h"
-/* Notice that this has to be `int' to make resources work. */
-static int keyset1[9], keyset2[9];
-
#ifdef COMMON_KBD
int joystick_port_map[2];
#endif
Modified: trunk/vice/src/arch/msdos/petui.c
===================================================================
--- trunk/vice/src/arch/msdos/petui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/petui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "lib.h"
#include "menudefs.h"
Modified: trunk/vice/src/arch/msdos/plus4ui.c
===================================================================
--- trunk/vice/src/arch/msdos/plus4ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/plus4ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -28,6 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "lib.h"
#include "menudefs.h"
Modified: trunk/vice/src/arch/msdos/ui.c
===================================================================
--- trunk/vice/src/arch/msdos/ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -35,6 +35,7 @@
#include <stdio.h>
#include <sys/movedata.h>
#include <unistd.h>
+#include <string.h>
#include "cmdline.h"
#include "datasette.h"
@@ -75,19 +76,19 @@
/* UI-related resources and command-line options. */
/* Flag: Use keyboard LEDs? */
-static int use_leds;
+static unsigned int use_leds;
-static int statusbar_is_enabled;
+static unsigned int statusbar_is_enabled;
-static int set_use_leds(resource_value_t v, void *param)
+static int set_use_leds(int v, void *param)
{
- use_leds = (int)v;
+ use_leds = v;
return 0;
}
-static int set_statusbar_enabled(resource_value_t v, void *param)
+static int set_statusbar_enabled(int v, void *param)
{
- statusbar_is_enabled = (int)v;
+ statusbar_is_enabled = v;
if (statusbar_enabled()) {
statusbar_prepare();
statusbar_update();
Modified: trunk/vice/src/arch/msdos/uijoystick.c
===================================================================
--- trunk/vice/src/arch/msdos/uijoystick.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/uijoystick.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <allegro.h>
+#include <string.h>
#include "joy.h"
#include "lib.h"
Modified: trunk/vice/src/arch/msdos/uinetplay.c
===================================================================
--- trunk/vice/src/arch/msdos/uinetplay.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/uinetplay.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -104,7 +104,7 @@
char buf[10];
resources_get_int("NetworkServerPort", ¤t_port);
- sprintf(buf,"%d\0",current_port);
+ sprintf(buf,"%d",current_port);
if (tui_input_string("TCP Port", "Enter TCP Port to use:", buf, 10) == 0)
{
Modified: trunk/vice/src/arch/msdos/uiperipherial.c
===================================================================
--- trunk/vice/src/arch/msdos/uiperipherial.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/uiperipherial.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -28,6 +28,7 @@
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#include "fsdevice.h"
#include "lib.h"
@@ -68,7 +69,7 @@
if (been_activated) {
char *path;
- int len = 255;
+ unsigned int len = 255;
resources_get_string(rname, &v);
if (len < strlen(v) * 2)
Modified: trunk/vice/src/arch/msdos/video.c
===================================================================
--- trunk/vice/src/arch/msdos/video.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/msdos/video.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -348,7 +348,7 @@
static void canvas_change_palette(video_canvas_t *c)
{
- int i;
+ unsigned int i;
int col;
int next_avail = 0;
Modified: trunk/vice/src/arch/os2/archdep.c
===================================================================
--- trunk/vice/src/arch/os2/archdep.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/archdep.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -234,7 +234,9 @@
FILE *archdep_open_default_log_file()
{
+#ifndef __X1541__
int val;
+#endif
char *fname = util_concat(archdep_boot_path(), "\\vice2.log", NULL);
fLog = fopen(fname, "w");
Modified: trunk/vice/src/arch/os2/blockdev.c
===================================================================
--- trunk/vice/src/arch/os2/blockdev.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/blockdev.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -37,9 +37,6 @@
/*static log_t blockdev_log = LOG_DEFAULT;*/
-static int device;
-
-
int blockdev_open(const char *name, unsigned int *read_only)
{
return -1;
Modified: trunk/vice/src/arch/os2/dialogs/dlg-cmdopt.c
===================================================================
--- trunk/vice/src/arch/os2/dialogs/dlg-cmdopt.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/dialogs/dlg-cmdopt.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -39,6 +39,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef WATCOM_COMPILE
+#include <process.h>
+#endif
+
#include "dialogs.h"
#include "menubar.h"
Modified: trunk/vice/src/arch/os2/dialogs/dlg-drive.c
===================================================================
--- trunk/vice/src/arch/os2/dialogs/dlg-drive.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/dialogs/dlg-drive.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -327,7 +327,6 @@
{
const HWND lbox = WinWindowFromID(hwnd, CBS_TYPE);
- int i;
int type=0;
int val;
int res;
Modified: trunk/vice/src/arch/os2/dialogs/dlg-fileio.c
===================================================================
--- trunk/vice/src/arch/os2/dialogs/dlg-fileio.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/dialogs/dlg-fileio.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -122,12 +122,14 @@
{NULL}
};
+#if defined(__X64__) || defined(__X128__) || defined(__XPET__) || defined(__XCBM__)
static filter_t FilterCart[] = {
{"*.crt; *.bin", "All Cartridge Images" },
{"*.crt", "CRT" },
{"*.bin", "BIN" },
{NULL}
};
+#endif
static filter_t FilterPal[] = {{"*.vpl", "Vice/2 Color Palette" }, {NULL}};
static filter_t FilterVsf[] = {{"*.vsf", "Vice/2 Snapshot File" }, {NULL}};
@@ -140,7 +142,11 @@
static filter_t FilterKernal[] = {{"kernal*", "Kernal ROM" }, {NULL}};
static filter_t FilterBasic[] = {{"basic*", "Basic ROM" }, {NULL}};
static filter_t FilterChargen[] = {{"charg*", "Character ROM" }, {NULL}};
+
+#ifdef __X128__
static filter_t FilterZ80[] = {{"z80bios*", "Z80 BIOS" }, {NULL}};
+#endif
+
static filter_t Filter1541[] = {{"dos1541*", "1541 ROM" }, {NULL}};
static filter_t Filter15412[] = {{"d1541II*", "1541-II ROM" }, {NULL}};
static filter_t Filter1571[] = {{"dos1571*", "1571 ROM" }, {NULL}};
@@ -168,7 +174,11 @@
static subaction_t SubTape[] = {{ "as Tape to Datasette", FilterTape }, {NULL}};
static subaction_t SubKbd[] = {{ "as new keyboard mapping", FilterKbd }, {NULL}};
static subaction_t SubCfg[] = {{ "as new configuration", FilterCfg }, {NULL}};
+
+#if defined __X64__ || defined __X128__
static subaction_t SubCart2[] = {{ "as cartridge image", FilterCart }, {NULL}};
+#endif
+
static subaction_t SubVsf[] = {{ "as Vice/2 snapshot file", FilterVsf }, {NULL}};
static subaction_t SubRomSet[] = {{ "as Vice/2 rom set", FilterRomSet},{NULL}};
@@ -629,8 +639,6 @@
static void ShowContents(HWND hwnd, char *image_name)
{
- int ascii;
- char *text;
image_contents_t *image;
image_contents_screencode_t *line;
image_contents_screencode_t *lines;
Modified: trunk/vice/src/arch/os2/dialogs/dlg-joystick.c
===================================================================
--- trunk/vice/src/arch/os2/dialogs/dlg-joystick.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/dialogs/dlg-joystick.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -61,9 +61,6 @@
static MRESULT EXPENTRY pm_joystick(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
{
- const int ID_ON = 1;
- const int ID_OFF = 2;
-
switch (msg)
{
case WM_INITDLG:
@@ -160,8 +157,6 @@
break;
case WM_SETDLGS:
{
- HWND hwnd2;
-
int joy1 = (int)mp1;
int joy2 = (int)mp2;
int joys = joy1 | joy2;
Modified: trunk/vice/src/arch/os2/dialogs/dlg-monitor.c
===================================================================
--- trunk/vice/src/arch/os2/dialogs/dlg-monitor.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/dialogs/dlg-monitor.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -38,6 +38,10 @@
#include <os2.h>
+#ifdef WATCOM_COMPILE
+#include <process.h>
+#endif
+
#include "dialogs.h"
#include "dlg-monitor.h"
@@ -73,17 +77,6 @@
// --------------------------------------------------------------------------
-static char *fmt(unsigned int val, unsigned char sz)
-{
- static char txt[5];
-
- char tmp[7];
- sprintf(tmp, "%%0%ix", sz);
- sprintf(txt, tmp, val);
-
- return txt;
-}
-
static const char *mon_dis(MEMSPACE mem, WORD loc, unsigned int *size)
{
const BYTE op = mon_get_mem_val(mem, loc);
Modified: trunk/vice/src/arch/os2/dialogs/menubar.c
===================================================================
--- trunk/vice/src/arch/os2/dialogs/menubar.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/dialogs/menubar.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -113,9 +113,11 @@
#if defined HAVE_CRTC && !defined __XCBM__
static const char *VIDEO_CACHE="CrtcVideoCache";
+#ifdef HAVE_PAL
static const char *DOUBLE_SIZE="CrtcDoubleSize";
static const char *DOUBLE_SCAN="CrtcDoubleScan";
#endif
+#endif
/*
#if defined __X64__ || defined __X128__ || defined __XVIC__ || defined __XPLUS4__
static const char *VIDEO_CACHE="ViciiVideoCache";
@@ -698,7 +700,7 @@
case IDM_VCACHE:
#ifdef __XCBM__
{
- long val;
+ int val;
resources_get_int("UseVicII", &val);
toggle(val?VIDEO_CACHE:"CrtcVideoCache");
}
Modified: trunk/vice/src/arch/os2/fullscr.c
===================================================================
--- trunk/vice/src/arch/os2/fullscr.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/fullscr.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -376,11 +376,7 @@
SWP swp;
GDDMODEINFO *mode;
- unsigned int maxw = -1;
- unsigned int maxh = -1;
- unsigned int rate = -1;
FOURCC fcc = fccColorEncoding;
- int l;
WinQueryWindowPos(hwnd, &swp);
@@ -444,8 +440,6 @@
GDDMODEINFO *mode;
FOURCC fcc = fccColorEncoding;
- int l;
-
if (!hmodVMAN || !fFullScreenMode)
return;
Modified: trunk/vice/src/arch/os2/kbd/parse.c
===================================================================
--- trunk/vice/src/arch/os2/kbd/parse.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/kbd/parse.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -127,7 +127,6 @@
shift = atoi(p);
{
- int s;
switch (buffer[0])
{
case '#':
@@ -162,7 +161,7 @@
case '!': // keyword handling
{
char *p;
- int num, row, col, shift;
+ int row, col;
p = strtok(buffer+1, " \t:");
if (!p)
Modified: trunk/vice/src/arch/os2/ui.c
===================================================================
--- trunk/vice/src/arch/os2/ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -279,9 +279,6 @@
void ui_display_drive_current_image(unsigned int drive_number,
const char *image)
{
- const ULONG flCmd =
- DT_TEXTATTRS|DT_VCENTER|DT_LEFT|DT_ERASERECT|DT_WORDBREAK;
-
if (image && *image)
{
int pos=0, i;
Modified: trunk/vice/src/arch/os2/uimon.c
===================================================================
--- trunk/vice/src/arch/os2/uimon.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/uimon.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -113,7 +113,7 @@
if (!out) out = lib_calloc(1,1);
- txt=buffer;
+ txt=(char *)buffer;
eol = strchr(txt, '\n');
while (strrchr(txt,'\n') && eol!= txt+strlen(txt))
Modified: trunk/vice/src/arch/os2/video.c
===================================================================
--- trunk/vice/src/arch/os2/video.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/video.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -61,6 +61,10 @@
#include <graph.h>
#endif
+#ifdef WATCOM_COMPILE
+#include <process.h>
+#endif
+
#include "video.h"
#include "videoarch.h"
@@ -254,19 +258,19 @@
lib_free(txt);
}
}
- /*
+#if 0
else
{
- extern FNVMIENTRY *pfnVMIEntry; // The entry of VMAN.DLL
+ extern FNVMIENTRY *pfnVMIEntry;
TEXTBLTINFO txt;
memset(&txt, 0, sizeof(TEXTBLTINFO));
txt.ulLength = sizeof(TEXTBLTINFO);
- (*pfnVMIEntry)(0, 18/*VMI_CMD_TEXT/, &txt, 0);
+ (*pfnVMIEntry)(0, 18 VMI_CMD_TEXT/, &txt, 0);
}
- */
+#endif
}
/* ------------------------------------------------------------------------ */
@@ -886,8 +890,6 @@
void WmDestroy(HWND hwnd)
{
- ULONG rc;
-
video_canvas_t *c = GetCanvas(hwnd);
if (!c)
@@ -1081,19 +1083,6 @@
log_message(vidlog, "Debug - fbuf read y: %d + %d > %d, c->height=%d", ys, h, bufh, c->height);
h = bufh-ys;
}
- if (xs<0)
- {
- log_message(vidlog, "Debug - fbuf read x: %d < 0", xs);
- w += xs;
- xs = 0;
- }
- if (ys<0)
- {
- log_message(vidlog, "Debug - fbuf read y: %d < 0", ys);
- h += ys;
- ys = 0;
-
- }
if (xi+w > c->width)
{
log_message(vidlog, "Debug - scr write x x%d: %d + %d > %d", dsx, xi, w, c->width);
@@ -1104,18 +1093,6 @@
log_message(vidlog, "Debug - scr write y x%d: %d + %d > %d", dsy, yi, h, c->height);
h = c->height-yi;
}
- if (xi<0)
- {
- log_message(vidlog, "Debug - scr write x: %d < 0", xi);
- w += xi;
- xi = 0;
- }
- if (yi<0)
- {
- log_message(vidlog, "Debug - scr write y: %d < 0", yi);
- h += yi;
- yi = 0;
- }
#ifndef DIRECT_ACCESS
//
@@ -1351,6 +1328,7 @@
return FALSE;
}
+#ifdef HAVE_MOUSE
static void DisplayPopupMenu(HWND hwnd, POINTS *pts)
{
const video_canvas_t *c = GetCanvas(hwnd);
@@ -1358,6 +1336,7 @@
WinPopupMenu(hwnd, hwnd, c->hwndPopupMenu, pts->x, pts->y, 0,
PU_MOUSEBUTTON2DOWN|PU_HCONSTRAIN|PU_VCONSTRAIN);
}
+#endif
MRESULT EXPENTRY CanvasWinProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
{
@@ -1551,7 +1530,7 @@
// WM_UPDATEFRAME also hides the loaded popup menu
// the size is also corrected
//
- set_menu((void*)menu, (void*)c->hwndClient);
+ set_menu(menu, (void*)c->hwndClient);
}
/*
void InitStatusBar(video_canvas_t *c)
@@ -1945,7 +1924,6 @@
// dive_alloc/free and video_canvas_refresh
//
SWP swp;
- ULONG rc;
UINT wold = c->width;
UINT hold = c->height;
Modified: trunk/vice/src/arch/os2/vsidui.c
===================================================================
--- trunk/vice/src/arch/os2/vsidui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/os2/vsidui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -32,6 +32,10 @@
#include <stdlib.h>
+#ifdef WATCOM_COMPILE
+#include <process.h>
+#endif
+
#include "dialogs.h"
#include "dlg-vsid.h"
#include "dlg-emulator.h" // hwndVsidEmulator
Modified: trunk/vice/src/arch/riscos/spritedrv.c
===================================================================
--- trunk/vice/src/arch/riscos/spritedrv.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/riscos/spritedrv.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -68,7 +68,7 @@
int bpp, pal_size, pal_bytes, header_size;
unsigned int *sprpalette;
sprite_area_t *sarea;
- int x;
+ unsigned int x;
if (pal->num_entries <= 2)
{
Modified: trunk/vice/src/arch/riscos/ui.c
===================================================================
--- trunk/vice/src/arch/riscos/ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/riscos/ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -216,7 +216,7 @@
static int WasAutoPaused = 0;
static int SoundVolume;
static int DisplayFPS = 0;
-static int DisplayDriveTrack = 0;
+static unsigned int DisplayDriveTrack = 0;
static int WimpScrapUsed = 0;
static int JoystickWindowOpen = 0;
static int WithinUiPoll = 0;
@@ -1526,7 +1526,7 @@
}
else
{
- if (ui_image_contents_disk(name) != 0);
+ if (ui_image_contents_disk(name) != 0)
return -1;
}
}
Modified: trunk/vice/src/arch/riscos/video.c
===================================================================
--- trunk/vice/src/arch/riscos/video.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/riscos/video.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -646,7 +646,7 @@
trans[i] = ct[i];
}
}
- for (; i<maxVideoCanvasColours; i++) trans[i] = 0;
+ for (; i<(unsigned int)maxVideoCanvasColours; i++) trans[i] = 0;
}
canvas->fb.transdirty = 0;
@@ -1080,7 +1080,7 @@
const palette_entry_t *p;
unsigned int numsprpal;
unsigned int *ct;
- int i;
+ unsigned int i;
if (palette == NULL) return 0;
@@ -1089,7 +1089,7 @@
lib_free(canvas->current_palette);
}
canvas->num_colours = palette->num_entries;
- if (canvas->num_colours > maxVideoCanvasColours)
+ if (canvas->num_colours > (unsigned int)maxVideoCanvasColours)
canvas->num_colours = maxVideoCanvasColours;
canvas->current_palette = lib_malloc((canvas->num_colours)*sizeof(int));
@@ -1185,7 +1185,7 @@
canvas->height *= 2;
canvas->num_colours = (canvas->palette == NULL) ? 16 : canvas->palette->num_entries;
- if (canvas->num_colours > maxVideoCanvasColours)
+ if (canvas->num_colours > (unsigned int)maxVideoCanvasColours)
canvas->num_colours = maxVideoCanvasColours;
canvas->current_palette = NULL;
canvas->shiftx = 0; canvas->shifty = 0; canvas->scale = 1;
Modified: trunk/vice/src/arch/riscos/videoarch.h
===================================================================
--- trunk/vice/src/arch/riscos/videoarch.h 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/riscos/videoarch.h 2008-05-25 18:37:11 UTC (rev 18807)
@@ -31,6 +31,7 @@
#include "vice.h"
#include "types.h"
+#include "video.h"
#include "wlsprite.h"
Modified: trunk/vice/src/arch/unix/gp2x/audio_gp2x.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/audio_gp2x.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/audio_gp2x.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -28,7 +28,7 @@
#include "minimal.h"
-static volume=100;
+static int volume=100;
void gp2x_sound_frame(void *blah, void *buff, int samples) {}
Modified: trunk/vice/src/arch/unix/gp2x/c128ui.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/c128ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/c128ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,8 +29,11 @@
#include <stdio.h>
#include <string.h>
+#include "cartridge.h"
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
+#include "uitext_gp2x.h"
#include "videoarch.h"
#include "vkeyboard_gp2x.h"
Modified: trunk/vice/src/arch/unix/gp2x/c64ui.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/c64ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/c64ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,8 +29,11 @@
#include <stdio.h>
#include <string.h>
+#include "cartridge.h"
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
+#include "uitext_gp2x.h"
#include "videoarch.h"
#include "vkeyboard_gp2x.h"
@@ -178,13 +181,6 @@
23, 4, 0,1, /* return */
24, 4, 0,1, /* return */
-#if 0
- 23, 5, 0|128,7, /* crsr up */
- 23, 6, 0,7, /* crsr down */
- 22, 6, 0|128,2, /* crsr left */
- 24, 6, 0,2, /* crsr right */
-#endif
-
21, 2, 0,0, /* delete */
22, 2, 0,0, /* delete */
23, 2, 0,0, /* delete */
Modified: trunk/vice/src/arch/unix/gp2x/cbm2ui.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/cbm2ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/cbm2ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,8 +29,10 @@
#include <stdio.h>
#include <string.h>
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
+#include "uitext_gp2x.h"
#include "videoarch.h"
#include "vkeyboard_gp2x.h"
Modified: trunk/vice/src/arch/unix/gp2x/input_gp2x.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/input_gp2x.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/input_gp2x.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -53,18 +53,11 @@
int input_select=0;
void gp2x_poll_input() {
- static int swap_button;
static int stats_button;
static int prefs_button;
static int vkeyb_button;
-#if 0
- static int choose_button;
-#endif
static int joy_time=0;
- static int a_held=0;
- static int b_held=0;
static int x_held=0;
- static int y_held=0;
unsigned int joy_state=gp2x_joystick_read();
@@ -72,9 +65,6 @@
if(!(joy_state&GP2X_SELECT)) prefs_button=0;
if(joy_state&GP2X_SELECT && !prefs_button) {
prefs_open=~prefs_open;
-#if 0
- ui_pause_emulation(1);
-#endif
prefs_button=1;
}
@@ -91,11 +81,8 @@
if(!rrate) rrate++;
if(joy_state&(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT)) joy_time+=rrate;
else joy_time=0;
-#if 0
- if(joy_time==rrate || !(joy_time%(4+rrate)) || joy_time>35) {
-#endif
if(joy_time==rrate || (joy_time>6)) {
- if(joy_time>4) joy_time==rrate;
+ if(joy_time>4) joy_time=rrate;
input_up=joy_state&GP2X_UP;
input_down=joy_state&GP2X_DOWN;
input_select=joy_state&GP2X_SELECT;
@@ -103,16 +90,7 @@
input_right=joy_state&GP2X_RIGHT;
}
-#if 0
/* B button */
- if(!(joy_state&(GP2X_B|GP2X_PUSH))) {
- input_b=0;
- input_b_deselected=1;
- } else if(input_b_deselected && (joy_state&(GP2X_B|GP2X_PUSH))) {
- input_b=1;
- }
-#endif
- /* B button */
if((joy_state&(GP2X_B|GP2X_PUSH))!=input_b_last) {
input_b=joy_state&(GP2X_B|GP2X_PUSH);
input_b_last=input_b;
@@ -144,41 +122,12 @@
keyboard_set_keyarr(7,4,0);
}
-#if 0
- /* a */
- if((joy_state&GP2X_A)&&!a_held) {
- a_held=1;
- keyboard_set_keyarr(1,2,1);
- } else if(a_held&&(!(joy_state&GP2X_A))) {
- a_held=0;
- keyboard_set_keyarr(1,2,0);
- }
- if((joy_state&GP2X_Y)&&!y_held) {
- y_held=1;
- keyboard_set_keyarr(1,7,1);
- } else if(y_held&&(!(joy_state&GP2X_Y))) {
- y_held=0;
- keyboard_set_keyarr(1,7,0);
- }
-#endif
-
if(gp2x_joystick_read()&GP2X_VOL_UP) volume_up();
else if(gp2x_joystick_read()&GP2X_VOL_DOWN) volume_down();
if(prefs_open||vkeyb_open) return;
-#if 0
- BYTE j=0xff;
- unsigned int joy_state=gp2x_joystick_read();
- if(joy_state&GP2X_UP) j&=0xfe;
- else if(joy_state&GP2X_DOWN) j&=0xfd;
- if(joy_state&GP2X_LEFT) j&=0xfb;
- else if(joy_state&GP2X_RIGHT) j&=0xf7;
- if(joy_state&GP2X_B) j&=0xef; /* fire */
- joystick_value[cur_port]=~j;
-#endif
-
BYTE j=joystick_value[cur_port];
if(joy_state&GP2X_UP) j|=0x01;
else j&=~0x01;
Modified: trunk/vice/src/arch/unix/gp2x/input_gp2x.h
===================================================================
--- trunk/vice/src/arch/unix/gp2x/input_gp2x.h 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/input_gp2x.h 2008-05-25 18:37:11 UTC (rev 18807)
@@ -33,4 +33,6 @@
extern int cur_port;
+extern void gp2x_poll_input();
+
#endif
Modified: trunk/vice/src/arch/unix/gp2x/minimal.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/minimal.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/minimal.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -126,9 +126,6 @@
{
unsigned long address=gp2x_physvram[gp2x_physvram[7]];
-#if 0
- if(++gp2x_physvram[7]==4) gp2x_physvram[7]=0;
-#endif
if(gp2x_physvram[7]==0) gp2x_physvram[7]=1;
else gp2x_physvram[7]=0;
@@ -208,22 +205,6 @@
void gp2x_sound_pause(int yes) { gp2x_sound_pausei=yes; }
-static void *gp2x_sound_play(void *blah)
-{
- int flip=0, flyp=gp2x_sound_buffer[1];
- struct timespec ts; ts.tv_sec=0, ts.tv_nsec=gp2x_sound_buffer[2];
-
- while(!gp2x_sound) { nanosleep(&ts, NULL);
-
- if(!gp2x_sound_pausei) { gp2x_sound_frame(blah, (void *)(&gp2x_sound_buffer[4+flip]), gp2x_sound_buffer[0]);
- write(gp2x_dev[3], (void *)(&gp2x_sound_buffer[4+flyp]), gp2x_sound_buffer[1]);
-
- flip+=gp2x_sound_buffer[1]; if(flip==gp2x_sound_buffer[1]*8) flip=0;
- flyp+=gp2x_sound_buffer[1]; if(flyp==gp2x_sound_buffer[1]*8) flyp=0;
- }}
- return NULL;
-}
-
static void gp2x_initqueue(gp2x_queue *q, unsigned long queue_items, unsigned long *position920t, unsigned long *position940t)
{
q->head = q->tail = q->items = 0;
@@ -240,16 +221,6 @@
q->items++;
}
-#if 0
-/* UNUSED */
- static unsigned long gp2x_dequeue(gp2x_queue *q)
-{
- while(!q->items); /* waiting for head to increase... */
- q->items--;
- return q->place920t[q->tail = (q->tail < q->max_items ? q->tail+1 : 0)];
-}
-#endif
-
void gp2x_dualcore_pause(int yes) { if(yes) gp2x_memregs[0x0904>>1] &= 0xFFFE; else gp2x_memregs[0x0904>>1] |= 1; }
static void gp2x_940t_reset(int yes) { gp2x_memregs[0x3B48>>1] = ((yes&1) << 7) | (0x03); }
static void gp2x_940t_pause(int yes) { gp2x_dualcore_pause(yes); }
@@ -329,16 +300,10 @@
if(!gp2x_dev[0]) gp2x_dev[0] = open("/dev/fb0", O_RDWR);
if(!gp2x_dev[1]) gp2x_dev[1] = open("/dev/fb1", O_RDWR);
if(!gp2x_dev[2]) gp2x_dev[2] = open("/dev/mem", O_RDWR);
-#if 0
- md if(!gp2x_dev[3]) gp2x_dev[3] = open("/dev/dsp", O_WRONLY);
-#endif
if(!gp2x_dev[4]) gp2x_dev[4] = open("/dev/mixer", O_RDWR);
gp2x_dualcore_ram=(unsigned long *)mmap(0, 0x1000000, PROT_READ|PROT_WRITE, MAP_SHARED, gp2x_dev[2], 0x03000000);
-#if 0
- gp2x_dualcore_ram=(unsigned long *)mmap(0, 0x2000000, PROT_READ|PROT_WRITE, MAP_SHARED, gp2x_dev[2], 0x02000000);
-#endif
gp2x_memregl=(unsigned long *)mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, gp2x_dev[2], 0xc0000000);
gp2x_memregs=(unsigned short *)gp2x_memregl;
@@ -366,20 +331,6 @@
if(bpp==8) gp2x_physvram[2]+=320*240, gp2x_physvram[3]+=320*240,
gp2x_logvram15[2]+=320*240/2, gp2x_logvram15[3]+=320*240/2;
-#if 0
- md ioctl(gp2x_dev[3], SNDCTL_DSP_SPEED, &rate);
- md ioctl(gp2x_dev[3], SNDCTL_DSP_SETFMT, &bits);
- md ioctl(gp2x_dev[3], SNDCTL_DSP_STEREO, &stereo);
-
- md gp2x_sound_buffer[1]=(gp2x_sound_buffer[0]=(rate/Hz)) << (stereo + (bits==16));
- md gp2x_sound_buffer[2]=(1000000/Hz);
-
- stereo = 0x00100009;ioctl(gp2x_dev[3], SNDCTL_DSP_SETFRAGMENT, &stereo);
-
- md if(first) { pthread_create( &gp2x_sound_thread, NULL, gp2x_sound_play, NULL);
- atexit(gp2x_deinit);
- first=0; }
-#endif
}
Modified: trunk/vice/src/arch/unix/gp2x/petui.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/petui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/petui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <string.h>
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
#include "videoarch.h"
@@ -37,9 +38,6 @@
/* reserved for future sid cart support */
void petui_handle_sidengine_resource(int value)
{
-#if 0
- resources_set_int("SidEngine", value);
-#endif
}
int petui_handle_X(int Xvalue)
@@ -50,19 +48,6 @@
/* reserved for future sid cart support */
void petui_draw_resid_string(unsigned char *screen, int menu_x, int menu_y)
{
-#if 0
- int sidengine;
-
- resources_get_int("SidEngine", &sidengine);
- if(sidengine)
- {
- draw_ascii_string(screen, display_width, menu_x, menu_y, "ReSID", menu_fg, menu_bg);
- }
- else
- {
- draw_ascii_string(screen, display_width, menu_x, menu_y, "FastSID", menu_fg, menu_bg);
- }
-#endif
}
void petui_draw_memory_string(unsigned char *screen, int menu_x, int menu_y, int mem)
@@ -176,15 +161,6 @@
10,5, 0,0, /* runstop fixme */
11,5, 0,0, /* runstop fixme */
-#if 0
- 4,5, 8,2, /* space */
- 5,5, 8,2, /* */
- 6,5, 8,2, /* */
- 7,5, 8,2, /* */
- 8,5, 8,2, /* */
-/* keys found 1,4 is 7(diff keypad?) 0,4 is 8 (diff keypad?) 1,5, is an up arrow */
-/* 0,6 odd screen effect? moves it up */
-#endif
0
};
Modified: trunk/vice/src/arch/unix/gp2x/plus4ui.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/plus4ui.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/plus4ui.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <string.h>
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
#include "videoarch.h"
@@ -37,9 +38,6 @@
/* reserved for future sid cart support */
void plus4ui_handle_sidengine_resource(int value)
{
-#if 0
- resources_set_int("SidEngine", value);
-#endif
}
int plus4ui_handle_X(int Xvalue)
@@ -50,19 +48,6 @@
/* reserved for future sid cart support */
void plus4ui_draw_resid_string(unsigned char *screen, int menu_x, int menu_y)
{
-#if 0
- int sidengine;
-
- resources_get_int("SidEngine", &sidengine);
- if(sidengine)
- {
- draw_ascii_string(screen, display_width, menu_x, menu_y, "ReSID", menu_fg, menu_bg);
- }
- else
- {
- draw_ascii_string(screen, display_width, menu_x, menu_y, "FastSID", menu_fg, menu_bg);
- }
-#endif
}
void plus4ui_draw_memory_string(unsigned char *screen, int menu_x, int menu_y, int mem)
Modified: trunk/vice/src/arch/unix/gp2x/prefs_gp2x.c
===================================================================
--- trunk/vice/src/arch/unix/gp2x/prefs_gp2x.c 2008-05-25 17:31:24 UTC (rev 18806)
+++ trunk/vice/src/arch/unix/gp2x/prefs_gp2x.c 2008-05-25 18:37:11 UTC (rev 18807)
@@ -30,22 +30,25 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include "minimal.h"
-#include "machine.h"
-#include "ui_gp2x.h"
-#include "input_gp2x.h"
-#include "prefs_gp2x.h"
-#include "videoarch.h"
#include <sys/types.h>
#include <dirent.h>
#include <sys/stat.h>
+
#include "attach.h"
#include "autostart.h"
-#include "resources.h"
-#include "imagecontents.h"
#include "cartridge.h"
+#include "imagecontents.h"
+#include "input_gp2x.h"
+#include "interrupt.h"
+#include "machine.h"
+#include "minimal.h"
+#include "prefs_gp2x.h"
+#include "resources.h"
#include "screenshot.h"
+#include "ui_gp2x.h"
#include "uiarch.h"
+#include "uitext_gp2x.h"
+#include "videoarch.h"
extern unsigned short *gp2x_memregs;
@@ -84,10 +87,6 @@
unsigned mdiv,pdiv=3,scale=0;
MHZ*=1000000;
mdiv=(MHZ*pdiv)/SYS_CLK_FREQ;
-#if 0
- printf ("Old value = %04X\r",MEM_REG[0x924>>1]," ");
- printf ("APLL = %04X\r",MEM_REG[0x91A>>1]," ");
-#endif
mdiv=((mdiv-8)<<8) & 0xff00;
pdiv=((pdiv-2)<<2) & 0xfc;
scale&=3;
@@ -110,9 +109,6 @@
gp2x_memregs[0x2906>>1]=614; /* scale horizontal */
if(tvout_pal) gp2x_memregs[0x2908>>1]=384; /* scale vertical PAL */
else gp2x_memregs[0x2908>>1]=460; /* scale vertical NTSC */
-#if 0
- gp2x_memregs[0x2908>>1]=430; /* scale vertical */
-#endif
} else {
gp2x_memregs[0x2906>>1]=1228; /* scale horizontal */
gp2x_memregs[0x2908>>1]=430; /* vertical */
@@ -185,23 +181,8 @@
char *contents_str;
static char *contents_list[255];
int row;
- static image_contents_t *contents;
- image_contents_file_list_t *prg_list;
-#if 0
- char tmp_string[255];
-#endif
int i;
-#if 0
- contents_list[0]="test1";
- contents_list[1]="test2";
- contents_list[2]="test3";
- contents_list[3]=NULL;
- num_items=3;
- cursor_pos=0;
- first_visible=0;
-#endif
-
if(num_items==0) {
contents_str=image_contents_read_string(IMAGE_CONTENTS_AUTO,
image, 8, IMAGE_CONTENTS_STRING_PETSCII);
@@ -223,51 +204,16 @@
draw_petscii_string(screen, display_width, MENU_X, MENU_Y,
contents_list[0], menu_fg, menu_bg);
-#if 0
- if(num_items==0) {
- contents=image_contents_read(IMAGE_CONTENTS_AUTO, image, 8);
- if(contents==NULL) return (char *)-1;
- prg_list=contents->file_list;
- for(num_items=0; prg_list!=NULL; num_items++) {
- prg_list=prg_list->next;
- }
- cursor_pos=0;
- first_visible=0;
- }
-
- draw_ascii_string(screen, display_width, MENU_X, MENU_Y, blank_line, menu_fg, menu_bg);
- draw_ascii_string(screen, display_width, MENU_X, MENU_Y,
- (char *)contents->name, menu_fg, menu_bg);
-
- prg_list=contents->file_list;
- for(i=0; i<first_visible; i++) prg_list=prg_list->next;
-#endif
-
row=0;
while(row<(num_items-1) && row<MENU_HEIGHT) {
if(row==(cursor_pos-first_visible)) {
bg=menu_hl;
-#if 0
- selected=(char *)prg_list->name;
-#endif
selected=contents_list[row+first_visible+1];
} else bg=menu_bg;
-#if 0
- if(dir_items[row+first_visible].type==0) {
- draw_ascii_string(screen, display_width, MENU_X, MENU_LS+(8*row), "<DIR> ", menu_fg, bg);
- }
- snprintf(tmp_string, 16, "%s", dir_items[row+first_visible].name);
- draw_ascii_string(screen, display_width, MENU_X+(8*6), MENU_LS+(8*row), tmp_string, menu_fg, bg);
- strncpy(tmp_string, prg_list->name, 255);
-#endif
draw_ascii_string(screen, display_width, MENU_X, MENU_LS+(8*row),
blank_line, menu_fg, bg);
draw_petscii_string(screen, display_width, MENU_X, MENU_LS+(8*row),
contents_list[row+first_visible+1], menu_fg, bg);
-#if 0
- (char *)prg_list->name, menu_fg, bg);
- prg_list=prg_list->next;
-#endif
row++;
}
while(row<MENU_HEIGHT) {
@@ -455,10 +401,6 @@
+strlen(dir_items[cursor_pos].name)
+2);
sprintf(path, "%s/%s", cwd, dir_items[cursor_pos].name);
-#if 0
- /* FIXME */
- for(i=0; i<num_items; i++) free(dir_items[i].name);
-#endif
if(dir_items[cursor_pos].type==0) {
/* directory selected */
pathlength=strlen(path);
@@ -466,16 +408,10 @@
/* check for . selected */
&& path[pathlength-2]=='/') {
path[pathlength-2]='\0';
-#if 0
- return path;
-#endif
} else if(path[pathlength-1]=='.'
/* check for .. selected */
&& path[pathlength-2]=='.'
&& path[pathlength-3]=='/') {
-#if 0
- &&pathlength>4) {
-#endif
for(i=4; i<pathlength && path[pathlength-i]!='/'; i++);
if(i<pathlength
&& path[(pathlength-i)+1]!='.'
@@ -485,12 +421,6 @@
path[0]='.';
path[1]='\0';
}
-#if 0
- if(strlen(path)<=5) {
- path[5]='/';
- path[6]='\0';
- }
-#endif
cwd=path;
} else {
cwd=path;
@@ -503,9 +433,6 @@
/* file selected */
return path;
}
-#if 0
- } else if(input_select) {
-#endif
} else if(input_x) {
input_x=0;
return (char *)-1;
@@ -526,7 +453,7 @@
void draw_prefs(unsigned char *screen) {
static int cursor_pos=0;
- unsigned char bg, fg;
+ unsigned char bg;
char tmp_string[1024];
char tmp_string2[1024];
char tmp_string3[1024];
@@ -542,12 +469,7 @@
static int attach_cart_vic20_a000=0;
static int attach_cart_vic20_b000=0;
static char *imagefile;
-#if 0
- static int xfiletype;
-#endif
- int update_prefs=0;
- int i,j;
- char zip_error_str[255];
+ int i;
option_txt[AUTOSTART]= "Autostart image... ";
option_txt[START]= "Browse d64... ";
@@ -630,40 +552,6 @@
imagefile=tmp_string2;
}
#endif
-#if 0
- if(!strcmp(imagefile+(strlen(imagefile)-4), ".sna")
- || !strcmp(imagefile+(strlen(imagefile)-4), ".SNA")) {
- TheC64->LoadSnapshot(imagefile);
- TheC64->Resume();
- sdl_prefs_open=false;
- } else if(!strcmp(imagefile+(strlen(imagefile)-4), ".prg")
- || !strcmp(imagefile+(strlen(imagefile)-4), ".PRG")) {
- char loadprg[255];
- for(i=strlen(imagefile); i>0; i--) {
- if(imagefile[i]=='/') break;
- }
- strcpy(loadprg, "\rLOAD\"");
- for(j=0; imagefile[i+1+j]; j++) {
- unsigned char c;
- c=imagefile[i+1+j];
- if ((c >= 'A') && (c <= 'Z') || (c >= 'a') && (c <= 'z')) c ^= 0x20;
- tmp_string[j]=c;
- }
- tmp_string[j]='\0';
- strcat(loadprg, tmp_string);
- strcat(loadprg, "\",8,1\rRUN\r");
- imagefile[i]='\0';
- strcpy(prefs->DrivePath[0], imagefile);
- kbd_buf_feed(loadprg);
- update_prefs=1;
- TheC64->Resume();
- sdl_prefs_open=false;
- } else {
- strcpy(prefs->DrivePath[0], imagefile);
- update_prefs=1;
- cursor_pos=LOADSTAR;
- }
-#endif
if(auto_start) {
autostart_autodetect(imagefile, NULL, 0, 0);
auto_start=0;
@@ -677,10 +565,6 @@
imagefile=NULL;
gotfilename=0;
} else {
-#if 0
- fprintf(stderr, "calling autostart %s, %s\n",
- imagefile, image_prg);
-#endif
autostart_autodetect(imagefile, image_prg, 0, 0);
manual_start=0;
getfilename=0;
@@ -756,21 +640,8 @@
} else if(cursor_pos==SIDENGINE) {
ui_handle_sidengine_resource(0);
} else if(cursor_pos==SCALED) {
-#if 0
- gp2x_memregs[0x2906>>1]=1024; /* scale horizontal */
- gp2x_memregs[0x2908>>1]=320; /* vertical */
- display_width=320;
- gp2x_memregs[0x290c>>1]=display_width; /* screen width */
-#endif
hwscaling=0;
display_set();
-#if 0
- } else if(cursor_pos==TVOUT) {
- gp2x_memregs[0x2800>>1]&=~0x300;
- tvout=0;
- tvout_pal=0;
- display_set();
-#endif
} else if(cursor_pos==CENTRED) {
xoffset=xoffset_uncentred;
yoffset=yoffset_uncentred;
@@ -806,23 +677,8 @@
} else if(cursor_pos==SIDENGINE) {
ui_handle_sidengine_resource(1);
} else if(cursor_pos==SCALED) {
-#if 0
- gp2x_memregs[0x2906>>1]=1228; /* scale horizontal */
- gp2x_memregs[0x2908>>1]=430; /* scale vertical */
- gp2x_memregs[0x2908>>1]=384; /* scale vertical */
- display_width=384;
- gp2x_memregs[0x290c>>1]=display_width; /* screen width */
-#endif
hwscaling=1;
display_set();
-#if 0
- } else if(cursor_pos==TVOUT) {
- gp2x_memregs[0x2800>>1]|=0x300;
- hwscaling=1;
- tvout=1;
- tvout_pal=1;
- display_set();
-#endif
} else if(cursor_pos==CENTRED) {
xoffset=xoffset_centred;
yoffset=yoffset_centred;
@@ -838,24 +694,6 @@
} else if(cursor_pos==X8) {
if (ui_set_ramblocks(1)==1) vic20_mem=5;
}
-#if 0
- if(cursor_pos==LIMITSPEED) {
- prefs->LimitSpeed=true;
- update_prefs=1;
- } else if(cursor_pos==RESET) {
- prefs->FastReset=true;
- update_prefs=1;
- } else if(cursor_pos==SOUND) {
- prefs->SIDType=SIDTYPE_DIGITAL;
- update_prefs=1;
- } else if(cursor_pos==RCONTROL) {
- control_reversed=1;
- } else if(cursor_pos==BRIGHTNESS) {
- set_luma(brightness+1, contrast);
- } else if(cursor_pos==CONTRAST) {
- set_luma(brightness, contrast+1);
- }
-#endif
}
if(input_b) {
@@ -920,10 +758,6 @@
}
closedir(snaps_dir);
}
-#if 0
- char *fname="test.sna";
- interrupt_maincpu_trigger_trap(write_snapshot, (void *)fname);
-#endif
sprintf(tmp_string2, "%s/%s", "./snapshots", tmp_string);
interrupt_maincpu_trigger_trap(write_snapshot, (void *)tmp_string2);
sprintf(tmp_string3, "%s/screen%04d.bmp", "./snapshots", snapnum-1);
@@ -933,64 +767,8 @@
resources_save("vicerc");
exit(0);
}
-#if 0
- if(cursor_pos==D64) {
- xfiletype=0;
- getfilename=true;
- } else if(cursor_pos==LOADSTAR) {
- kbd_buf_feed("\rLOAD\":*\",8,1\rRUN\r");
- TheC64->Resume();
- sdl_prefs_open=false;
- } else if(cursor_pos==LOADER) {
- load_prg(TheC64, c64loader, sizeof(c64loader));
- kbd_buf_feed("\rLOAD\"X\",8,1\rRUN\r");
- TheC64->Resume();
- sdl_prefs_open=false;
- } else if(cursor_pos==PRG) {
- xfiletype=1;
- getfilename=true;
- } else if(cursor_pos==LOAD_SNAP) {
- TheC64->LoadSnapshot("test.sna");
- TheC64->Resume();
- sdl_prefs_open=false;
- } else if(cursor_pos==SAVE_SNAP) {
-#ifdef __gp2x__
- chdir(AppDirPath);
- chdir("c64/snapshots/");
-#else
- chdir("/tmp/c64/snapshots/");
-#endif
- int freename=0;
- for(int snapnum=0; !freename; snapnum++) {
- DIR *...
[truncated message content] |
|
From: <cnv...@us...> - 2008-05-25 17:31:18
|
Revision: 18806
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18806&view=rev
Author: cnvogelg
Date: 2008-05-25 10:31:24 -0700 (Sun, 25 May 2008)
Log Message:
-----------
chris/v1.22.15-cocoa-port:
* configure.in:
honor OBJCFLAGS if available. added Carbon lib for Cocoa linking.
* src/arch/unix/archdep.[ch]:
made archdep_pref_path const.
* build/Makefile.am,
build/macosx/build-vice-release.sh:
added build-vice-release script
* Makefile.am:
make bindist on Macs need the bash
* data/C64/Makefile.am,
data/C64/osx_sym_de.vkm,
data/C64/osx_pos.vkm,
data/C64/osx_sym_us.vkm:
fixed Cocoa key maps
* src/arch/unix/macosx/make-bindist.sh,
src/arch/unix/macosx/Info.plist:
added crt file format. use new icons for Cocoa port.
* src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj:
added VICE XCode project to manage nib files more easily
* src/arch/unix/macosx/cocoa/main.m:
store preferences in ~/Library/Preferences/org.viceteam.<emu> now
* src/arch/unix/macosx/cocoa/uimon.m,src/arch/unix/macosx/cocoa/console.m,
src/arch/unix/macosx/cocoa/menu/c64machinecontroller.m:
deprecated NSString calls removed
* src/arch/unix/macosx/cocoa/kbd.h:
added cocoa sym_de keymap
* src/arch/unix/macosx/cocoa/videoarch.h,
src/arch/unix/macosx/cocoa/viceapplication.h,
src/arch/unix/macosx/cocoa/vicemachine.h,
src/arch/unix/macosx/cocoa/video.m,
src/arch/unix/macosx/cocoa/vicemachine.m:
added canvasId to manage canvas ptr on App side
* src/arch/unix/macosx/cocoa/kbd.m:
added missing include
* src/arch/unix/macosx/cocoa/fullscreen.m:
removed obsolete function
* src/arch/unix/macosx/cocoa/view/joystickview.m,
src/arch/unix/macosx/cocoa/view/keypressview.m:
removed compile warning
* src/arch/unix/macosx/cocoa/view/consolewindow.m:
fixed output bug
* src/arch/unix/macosx/cocoa/view/viceglview.[hm]:
added auto hide mouse and menu
* src/arch/unix/macosx/cocoa/dialog/viceresourcewindowcontroller.[hm]:
added resource methods
* src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.[hm]:
rewrote drive settings UI
* src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.[hm],
src/arch/unix/macosx/cocoa/dialog/resourceeditorcontroller.[hm]:
added resource editor
* src/arch/unix/macosx/cocoa/dialog/printersettingswindowcontroller.[hm]:
added printer settings UI
* src/arch/unix/macosx/cocoa/dialog/soundsettingswindowcontroller.[hm]:
added sound settings UI
* src/arch/unix/macosx/cocoa/dialog/iecdrivesettingswindowcontroller.[hm]:
added IEC drive settings UI
* src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.[hm]:
added record media UI
* src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.[hm]:
added keyboard settings UI
* src/arch/unix/macosx/cocoa/menu/viceappcontroller.[hm],
src/arch/unix/macosx/cocoa/menu/c64controller.[hm]:
added new UI dialogs
* src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.[hm]:
added machine control functions for new UI features
* src/arch/unix/macosx/Resources/English.lproj/*:
added nib files for new UI
* src/arch/unix/macosx/Makefile.am,
src/arch/unix/macosx/Resources/Makefile.am,
src/arch/unix/macosx/cocoa/dialog/Makefile.am:
added new files
Added Paths:
-----------
tags/chris/v1.22.15-cocoa-port/
Copied: tags/chris/v1.22.15-cocoa-port (from rev 18805, branches/chris/cocoa-port/vice)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-05-24 23:44:03
|
Revision: 18805
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18805&view=rev
Author: blackystardust
Date: 2008-05-24 16:44:10 -0700 (Sat, 24 May 2008)
Log Message:
-----------
Made a tag of my current warning fixes for various platforms, also included are most of the additional monitor features from VICEplus by Nojoopa.
Added Paths:
-----------
tags/marco/v1.22.15-warning-fixes/
Copied: tags/marco/v1.22.15-warning-fixes (from rev 18804, branches/marco/ports)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-05-24 22:46:50
|
Revision: 18804
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18804&view=rev
Author: blackystardust
Date: 2008-05-24 15:46:57 -0700 (Sat, 24 May 2008)
Log Message:
-----------
Fixed some unix warnings/issues
Modified Paths:
--------------
branches/marco/ports/vice/src/arch/unix/joy.h
branches/marco/ports/vice/src/arch/unix/x11/gnome/uicolor.c
branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c
branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/FileSel.c
branches/marco/ports/vice/src/sounddrv/soundarts.c
Modified: branches/marco/ports/vice/src/arch/unix/joy.h
===================================================================
--- branches/marco/ports/vice/src/arch/unix/joy.h 2008-05-24 16:56:05 UTC (rev 18803)
+++ branches/marco/ports/vice/src/arch/unix/joy.h 2008-05-24 22:46:57 UTC (rev 18804)
@@ -48,6 +48,12 @@
extern int joystick_port_map[2];
+#ifdef HAS_USB_JOYSTICK
+extern int usb_joystick_init(void);
+extern void usb_joystick_close(void);
+extern void usb_joystick(void);
+#endif
+
#define JOYDEV_NONE 0
#define JOYDEV_NUMPAD 1
#define JOYDEV_KEYSET1 2
Modified: branches/marco/ports/vice/src/arch/unix/x11/gnome/uicolor.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/gnome/uicolor.c 2008-05-24 16:56:05 UTC (rev 18803)
+++ branches/marco/ports/vice/src/arch/unix/x11/gnome/uicolor.c 2008-05-24 22:46:57 UTC (rev 18804)
@@ -95,7 +95,7 @@
int uicolor_set_palette(struct video_canvas_s *c, const palette_t *palette)
{
- int i;
+ unsigned int i;
uicolor_init_video_colors();
Modified: branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c 2008-05-24 16:56:05 UTC (rev 18803)
+++ branches/marco/ports/vice/src/arch/unix/x11/gnome/uipalcontrol.c 2008-05-24 22:46:57 UTC (rev 18804)
@@ -68,7 +68,8 @@
static void pal_ctrl_reset (GtkWidget *w, gpointer data)
{
- int i, tmp;
+ unsigned int i
+ int tmp;
for (i = 0; i < sizeof(ctrls)/sizeof(ctrls[0]); i++)
{
@@ -121,7 +122,8 @@
GtkWidget *box;
GtkWidget *rb;
- int i, v;
+ unsigned int i;
+ int v;
cached_canvas = canvas;
f = gtk_frame_new(_("PAL Settings"));
Modified: branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/FileSel.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/FileSel.c 2008-05-24 16:56:05 UTC (rev 18803)
+++ branches/marco/ports/vice/src/arch/unix/x11/xaw/widgets/FileSel.c 2008-05-24 22:46:57 UTC (rev 18804)
@@ -1234,7 +1234,9 @@
Widget cur_dir_text;
Arg args[10];
String path;
+#if defined VICE && (defined HAVE_REGEXP_H || defined HAVE_REGEX_H)
char *fpath, *fpattern;
+#endif
/* what is this actually needed for? */
XtSetArg(args[0],XtNstring,(XtArgVal)(&path));
Modified: branches/marco/ports/vice/src/sounddrv/soundarts.c
===================================================================
--- branches/marco/ports/vice/src/sounddrv/soundarts.c 2008-05-24 16:56:05 UTC (rev 18803)
+++ branches/marco/ports/vice/src/sounddrv/soundarts.c 2008-05-24 22:46:57 UTC (rev 18804)
@@ -57,7 +57,6 @@
static int artsdrv_fragsize;
static int artsdrv_fragnr;
static double artsdrv_bufsize;
-static int artsdrv_lastbs=0;
static int artsdrv_suspended=0;
/*
* static int artsdrv_bs=0;
@@ -135,6 +134,7 @@
}
+#if 0
/*
** As the aRts C API doesn't support a DSP_SNDCTL_POST equivalent
** function, i tried to emulate but apparently its not needed so
@@ -152,6 +152,7 @@
return 0;
};
+#endif
int artsdrv_resume(void)
{
@@ -172,8 +173,8 @@
NULL,
artsdrv_bufferspace,
artsdrv_close,
- NULL,//artsdrv_suspend,
- NULL,//artsdrv_resume
+ NULL, /* artsdrv_suspend */
+ NULL, /* artsdrv_resume */
1
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-05-24 16:57:02
|
Revision: 18803
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18803&view=rev
Author: blackystardust
Date: 2008-05-24 09:56:05 -0700 (Sat, 24 May 2008)
Log Message:
-----------
Updated readline replacement prototypes
Modified Paths:
--------------
branches/marco/ports/vice/src/arch/unix/readline/complete.c
branches/marco/ports/vice/src/arch/unix/readline/editline.c
branches/marco/ports/vice/src/arch/unix/readline/editline.h
branches/marco/ports/vice/src/arch/unix/readline/editline2.c
branches/marco/ports/vice/src/arch/unix/readline/sysunix.c
Modified: branches/marco/ports/vice/src/arch/unix/readline/complete.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/readline/complete.c 2008-05-24 01:09:08 UTC (rev 18802)
+++ branches/marco/ports/vice/src/arch/unix/readline/complete.c 2008-05-24 16:56:05 UTC (rev 18803)
@@ -9,9 +9,7 @@
/*
** Return an allocated copy of a string.
*/
-char *
-strdup(p)
- char *p;
+char *strdup(char *p)
{
char *new;
@@ -24,10 +22,7 @@
/*
** strcmp-like sorting predicate for qsort.
*/
-STATIC int
-compare(p1, p2)
- CONST void *p1;
- CONST void *p2;
+STATIC int compare(CONST void *p1, CONST void *p2)
{
CONST char **v1;
CONST char **v2;
@@ -41,11 +36,7 @@
** Fill in *avp with an array of names that match file, up to its length.
** Ignore . and .. .
*/
-STATIC int
-FindMatches(dir, file, avp)
- char *dir;
- char *file;
- char ***avp;
+STATIC int FindMatches(char *dir, char *file, char ***avp)
{
char **av;
char **new;
@@ -96,11 +87,7 @@
/*
** Split a pathname into allocated directory and trailing filename parts.
*/
-STATIC int
-SplitPath(path, dirpart, filepart)
- char *path;
- char **dirpart;
- char **filepart;
+STATIC int SplitPath(char *path, char **dirpart, char **filepart)
{
static char DOT[] = ".";
char *dpart;
@@ -132,10 +119,7 @@
** Attempt to complete the pathname, returning an allocated copy.
** Fill in *unique if we completed it, or set it to 0 if ambiguous.
*/
-char *
-rl_complete(pathname, unique)
- char *pathname;
- int *unique;
+char *rl_complete(char *pathname, int *unique)
{
char **av;
char *dir;
@@ -204,10 +188,7 @@
/*
** Return all possible completions.
*/
-int
-rl_list_possib(pathname, avp)
- char *pathname;
- char ***avp;
+int rl_list_possib(char *pathname, char ***avp)
{
char *dir;
char *file;
@@ -220,4 +201,3 @@
DISPOSE(file);
return ac;
}
-
Modified: branches/marco/ports/vice/src/arch/unix/readline/editline.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/readline/editline.c 2008-05-24 01:09:08 UTC (rev 18802)
+++ branches/marco/ports/vice/src/arch/unix/readline/editline.c 2008-05-24 16:56:05 UTC (rev 18803)
@@ -92,7 +92,9 @@
/*
** Declarations.
*/
-STATIC CHAR *editinput();
+STATIC CHAR *editinput(void);
+
+#if 0
extern int read();
extern int write();
#if defined(USE_TERMCAP)
@@ -100,13 +102,13 @@
extern char *tgetstr();
extern int tgetent();
#endif /* defined(USE_TERMCAP) */
+#endif
/*
** TTY input/output functions.
*/
-STATIC void
-TTYflush()
+STATIC void TTYflush(void)
{
if (ScreenCount) {
(void)write(1, Screen, ScreenCount);
@@ -114,9 +116,7 @@
}
}
-STATIC void
-TTYput(c)
- CHAR c;
+STATIC void TTYput(CHAR c)
{
Screen[ScreenCount] = c;
if (++ScreenCount >= ScreenSize - 1) {
@@ -125,17 +125,13 @@
}
}
-STATIC void
-TTYputs(p)
- CHAR *p;
+STATIC void TTYputs(CHAR *p)
{
while (*p)
TTYput(*p++);
}
-STATIC void
-TTYshow(c)
- CHAR c;
+STATIC void TTYshow(CHAR c)
{
if (c == DEL) {
TTYput('^');
@@ -154,16 +150,13 @@
TTYput(c);
}
-STATIC void
-TTYstring(p)
- CHAR *p;
+STATIC void TTYstring(CHAR *p)
{
while (*p)
TTYshow(*p++);
}
-STATIC unsigned int
-TTYget()
+STATIC unsigned int TTYget(void)
{
CHAR c;
@@ -179,16 +172,13 @@
#define TTYback() (backspace ? TTYputs((CHAR *)backspace) : TTYput('\b'))
-STATIC void
-TTYbackn(n)
- int n;
+STATIC void TTYbackn(int n)
{
while (--n >= 0)
TTYback();
}
-STATIC void
-TTYinfo()
+STATIC void TTYinfo(void)
{
static int init;
#if defined(USE_TERMCAP)
@@ -244,10 +234,7 @@
/*
** Print an array of words in columns.
*/
-STATIC void
-columns(ac, av)
- int ac;
- CHAR **av;
+STATIC void columns(int ac, CHAR **av)
{
CHAR *p;
int i;
@@ -277,8 +264,7 @@
}
}
-STATIC void
-reposition()
+STATIC void reposition(void)
{
int i;
CHAR *p;
@@ -289,9 +275,7 @@
TTYshow(*p);
}
-STATIC void
-left(Change)
- STATUS Change;
+STATIC void left(STATUS Change)
{
TTYback();
if (Point) {
@@ -306,26 +290,21 @@
Point--;
}
-STATIC void
-right(Change)
- STATUS Change;
+STATIC void right(STATUS Change)
{
TTYshow(Line[Point]);
if (Change == CSmove)
Point++;
}
-STATIC STATUS
-ring_bell()
+STATIC STATUS ring_bell(void)
{
TTYput('\07');
TTYflush();
return CSstay;
}
-STATIC STATUS
-do_macro(c)
- unsigned int c;
+STATIC STATUS do_macro(unsigned int c)
{
CHAR name[4];
@@ -341,9 +320,7 @@
return CSstay;
}
-STATIC STATUS
-do_forward(move)
- STATUS move;
+STATIC STATUS do_forward(STATUS move)
{
int i;
CHAR *p;
@@ -366,9 +343,7 @@
return CSstay;
}
-STATIC STATUS
-do_case(type)
- CASE type;
+STATIC STATUS do_case(CASE type)
{
int i;
int end;
@@ -395,20 +370,17 @@
return CSstay;
}
-STATIC STATUS
-case_down_word()
+STATIC STATUS case_down_word(void)
{
return do_case(TOlower);
}
-STATIC STATUS
-case_up_word()
+STATIC STATUS case_up_word(void)
{
return do_case(TOupper);
}
-STATIC void
-ceol()
+STATIC void ceol(void)
{
int extras;
int i;
@@ -431,8 +403,7 @@
TTYback();
}
-STATIC void
-clear_line()
+STATIC void clear_line(void)
{
Point = -strlen(Prompt);
TTYput('\r');
@@ -442,9 +413,7 @@
Line[0] = '\0';
}
-STATIC STATUS
-insert_string(p)
- CHAR *p;
+STATIC STATUS insert_string(CHAR *p)
{
SIZE_T len;
int i;
@@ -474,21 +443,17 @@
return Point == End ? CSstay : CSmove;
}
-STATIC CHAR *
-next_hist()
+STATIC CHAR *next_hist(void)
{
return H.Pos >= H.Size - 1 ? NULL : H.Lines[++H.Pos];
}
-STATIC CHAR *
-prev_hist()
+STATIC CHAR *prev_hist(void)
{
return H.Pos == 0 ? NULL : H.Lines[--H.Pos];
}
-STATIC STATUS
-do_insert_hist(p)
- CHAR *p;
+STATIC STATUS do_insert_hist(CHAR *p)
{
if (p == NULL)
return ring_bell();
@@ -499,9 +464,7 @@
return insert_string(p);
}
-STATIC STATUS
-do_hist(move)
- CHAR *(*move)();
+STATIC STATUS do_hist(CHAR *(*move)(void))
{
CHAR *p;
int i;
@@ -514,26 +477,22 @@
return do_insert_hist(p);
}
-STATIC STATUS
-h_next()
+STATIC STATUS h_next(void)
{
return do_hist(next_hist);
}
-STATIC STATUS
-h_prev()
+STATIC STATUS h_prev(void)
{
return do_hist(prev_hist);
}
-STATIC STATUS
-h_first()
+STATIC STATUS h_first(void)
{
return do_insert_hist(H.Lines[H.Pos = 0]);
}
-STATIC STATUS
-h_last()
+STATIC STATUS h_last(void)
{
return do_insert_hist(H.Lines[H.Pos = H.Size - 1]);
}
@@ -541,11 +500,7 @@
/*
** Return zero if pat appears as a substring in text.
*/
-STATIC int
-substrcmp(text, pat, len)
- char *text;
- char *pat;
- int len;
+STATIC int substrcmp(char *text, char *pat, int len)
{
CHAR c;
@@ -557,15 +512,12 @@
return 1;
}
-STATIC CHAR *
-search_hist(search, move)
- CHAR *search;
- CHAR *(*move)();
+STATIC CHAR *search_hist(CHAR *search, CHAR *(*move)(void))
{
static CHAR *old_search;
int len;
int pos;
- int (*match)();
+ int (*match)(char *text, char *pat, int len);
char *pat;
/* Save or get remembered search pattern. */
@@ -598,12 +550,11 @@
return NULL;
}
-STATIC STATUS
-h_search()
+STATIC STATUS h_search(void)
{
static int Searching;
CONST char *old_prompt;
- CHAR *(*move)();
+ CHAR *(*move)(void);
CHAR *p;
if (Searching)
@@ -624,8 +575,7 @@
return do_insert_hist(p);
}
-STATIC STATUS
-fd_char()
+STATIC STATUS fd_char(void)
{
int i;
@@ -638,10 +588,7 @@
return CSstay;
}
-STATIC void
-save_yank(begin, i)
- int begin;
- int i;
+STATIC void save_yank(int begin, int i)
{
if (Yanked) {
DISPOSE(Yanked);
@@ -657,9 +604,7 @@
}
}
-STATIC STATUS
-delete_string(count)
- int count;
+STATIC STATUS delete_string(int count)
{
int i;
CHAR *p;
@@ -700,8 +645,7 @@
return CSmove;
}
-STATIC STATUS
-bk_char()
+STATIC STATUS bk_char(void)
{
int i;
@@ -715,8 +659,7 @@
return CSstay;
}
-STATIC STATUS
-bk_del_char()
+STATIC STATUS bk_del_char(void)
{
int i;
@@ -730,8 +673,7 @@
return delete_string(i);
}
-STATIC STATUS
-redisplay()
+STATIC STATUS redisplay(void)
{
TTYputs((CHAR *)NEWLINE);
TTYputs((CHAR *)Prompt);
@@ -739,8 +681,7 @@
return CSmove;
}
-STATIC STATUS
-kill_line()
+STATIC STATUS kill_line(void)
{
int i;
@@ -765,9 +706,7 @@
return CSstay;
}
-STATIC STATUS
-insert_char(c)
- int c;
+STATIC STATUS insert_char(int c)
{
STATUS s;
CHAR buff[2];
@@ -792,8 +731,7 @@
return s;
}
-STATIC STATUS
-meta()
+STATIC STATUS meta(void)
{
unsigned int c;
KEYMAP *kp;
@@ -830,9 +768,7 @@
return ring_bell();
}
-STATIC STATUS
-emacs(c)
- unsigned int c;
+STATIC STATUS emacs(unsigned int c)
{
STATUS s;
KEYMAP *kp;
@@ -852,9 +788,7 @@
return s;
}
-STATIC STATUS
-TTYspecial(c)
- unsigned int c;
+STATIC STATUS TTYspecial(unsigned int c)
{
if (ISMETA(c))
return CSdispatch;
@@ -880,8 +814,7 @@
return CSdispatch;
}
-STATIC CHAR *
-editinput()
+STATIC CHAR *editinput(void)
{
unsigned int c;
@@ -918,9 +851,7 @@
return NULL;
}
-STATIC void
-hist_add(p)
- CHAR *p;
+STATIC void hist_add(CHAR *p)
{
int i;
@@ -941,20 +872,15 @@
** For compatibility with FSF readline.
*/
/* ARGSUSED0 */
-void
-rl_reset_terminal(p)
- char *p;
+void rl_reset_terminal(char *p)
{
}
-void
-rl_initialize()
+void rl_initialize(void)
{
}
-char *
-readline(prompt)
- CONST char *prompt;
+char *readline(CONST char *prompt)
{
CHAR *line;
@@ -982,9 +908,7 @@
return (char *)line;
}
-void
-add_history(p)
- char *p;
+void add_history(char *p)
{
if (p == NULL || *p == '\0')
return;
@@ -996,8 +920,7 @@
hist_add((CHAR *)p);
}
-STATIC STATUS
-beg_line()
+STATIC STATUS beg_line(void)
{
if (Point) {
Point = 0;
@@ -1006,14 +929,12 @@
return CSstay;
}
-STATIC STATUS
-del_char()
+STATIC STATUS del_char(void)
{
return delete_string(Repeat == NO_ARG ? 1 : Repeat);
}
-STATIC STATUS
-end_line()
+STATIC STATUS end_line(void)
{
if (Point != End) {
Point = End;
@@ -1026,8 +947,7 @@
** Move back to the beginning of the current word and return an
** allocated copy of it.
*/
-STATIC CHAR *
-find_word()
+STATIC CHAR *find_word(void)
{
static char SEPS[] = "#;&|^$=`'{}()<>\n\t ";
CHAR *p;
@@ -1044,8 +964,7 @@
return new;
}
-STATIC STATUS
-c_complete()
+STATIC STATUS c_complete(void)
{
CHAR *p;
CHAR *word;
@@ -1066,8 +985,7 @@
return ring_bell();
}
-STATIC STATUS
-c_possible()
+STATIC STATUS c_possible(void)
{
CHAR **av;
CHAR *word;
@@ -1087,15 +1005,13 @@
return ring_bell();
}
-STATIC STATUS
-accept_line()
+STATIC STATUS accept_line(void)
{
Line[End] = '\0';
return CSdone;
}
-STATIC STATUS
-transpose()
+STATIC STATUS transpose(void)
{
CHAR c;
@@ -1112,16 +1028,14 @@
return CSstay;
}
-STATIC STATUS
-quote()
+STATIC STATUS quote(void)
{
unsigned int c;
return (c = TTYget()) == EOF ? CSeof : insert_char((int)c);
}
-STATIC STATUS
-wipe()
+STATIC STATUS wipe(void)
{
int i;
@@ -1138,15 +1052,13 @@
return delete_string(Mark - Point);
}
-STATIC STATUS
-mk_set()
+STATIC STATUS mk_set(void)
{
Mark = Point;
return CSstay;
}
-STATIC STATUS
-exchange()
+STATIC STATUS exchange(void)
{
unsigned int c;
@@ -1161,16 +1073,14 @@
return CSstay;
}
-STATIC STATUS
-yank()
+STATIC STATUS yank(void)
{
if (Yanked && *Yanked)
return insert_string(Yanked);
return CSstay;
}
-STATIC STATUS
-copy_region()
+STATIC STATUS copy_region(void)
{
if (Mark > End)
return ring_bell();
@@ -1183,8 +1093,7 @@
return CSstay;
}
-STATIC STATUS
-move_to_char()
+STATIC STATUS move_to_char(void)
{
unsigned int c;
int i;
@@ -1200,14 +1109,12 @@
return CSstay;
}
-STATIC STATUS
-fd_word()
+STATIC STATUS fd_word(void)
{
return do_forward(CSmove);
}
-STATIC STATUS
-fd_kill_word()
+STATIC STATUS fd_kill_word(void)
{
int i;
@@ -1220,8 +1127,7 @@
return CSstay;
}
-STATIC STATUS
-bk_word()
+STATIC STATUS bk_word(void)
{
int i;
CHAR *p;
@@ -1241,8 +1147,7 @@
return CSstay;
}
-STATIC STATUS
-bk_kill_word()
+STATIC STATUS bk_kill_word(void)
{
(void)bk_word();
if (OldPoint != Point)
@@ -1250,10 +1155,7 @@
return CSstay;
}
-STATIC int
-argify(line, avp)
- CHAR *line;
- CHAR ***avp;
+STATIC int argify(CHAR *line, CHAR ***avp)
{
CHAR *c;
CHAR **p;
@@ -1296,8 +1198,7 @@
return ac;
}
-STATIC STATUS
-last_argument()
+STATIC STATUS last_argument(void)
{
CHAR **av;
CHAR *p;
@@ -1373,4 +1274,3 @@
{ 'w', copy_region },
{ 0, NULL }
};
-
Modified: branches/marco/ports/vice/src/arch/unix/readline/editline.h
===================================================================
--- branches/marco/ports/vice/src/arch/unix/readline/editline.h 2008-05-24 01:09:08 UTC (rev 18802)
+++ branches/marco/ports/vice/src/arch/unix/readline/editline.h 2008-05-24 16:56:05 UTC (rev 18803)
@@ -13,6 +13,10 @@
#include <string.h>
#endif /* defined(HAVE_STDLIB) */
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+
#if defined(SYS_UNIX)
#include "unix.h"
#endif /* defined(SYS_UNIX) */
@@ -58,17 +62,16 @@
extern int rl_intr;
extern int rl_kill;
extern int rl_quit;
-extern char *rl_complete();
-extern int rl_list_possib();
-extern void rl_ttyset();
-extern void rl_add_slash();
+extern char *rl_complete(char *pathname, int *unique);
+extern int rl_list_possib(char *pathname, char ***avp);
+extern void rl_ttyset(int Reset);
+extern void rl_add_slash(char *path, char *p);
-extern void rl_reset_terminal();
-extern void rl_initialize();
-extern char *readline();
-extern void add_history();
+extern void rl_reset_terminal(char *p);
+extern void rl_initialize(void);
+extern char *readline(CONST char *prompt);
+extern void add_history(char *p);
-
#if !defined(HAVE_STDLIB)
extern char *getenv();
extern char *malloc();
@@ -83,4 +86,3 @@
extern int strlen();
extern int strncmp();
#endif /* !defined(HAVE_STDLIB) */
-
Modified: branches/marco/ports/vice/src/arch/unix/readline/editline2.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/readline/editline2.c 2008-05-24 01:09:08 UTC (rev 18802)
+++ branches/marco/ports/vice/src/arch/unix/readline/editline2.c 2008-05-24 16:56:05 UTC (rev 18803)
@@ -88,39 +88,39 @@
* Removed FORWARD addressing ...
*/
-STATIC STATUS accept_line();
-STATIC STATUS beg_line();
-STATIC STATUS bk_char();
-STATIC STATUS bk_del_char();
-STATIC STATUS bk_kill_word();
-STATIC STATUS mk_set();
-STATIC STATUS bk_word();
-STATIC STATUS fd_kill_word();
-STATIC STATUS fd_word();
-STATIC STATUS fd_char();
-STATIC STATUS case_down_word();
-STATIC STATUS case_up_word();
-STATIC STATUS copy_region();
-STATIC STATUS del_char();
-STATIC STATUS end_line();
-STATIC STATUS exchange();
-STATIC STATUS kill_line();
-STATIC STATUS last_argument();
-STATIC STATUS c_possible();
-STATIC STATUS c_complete();
-STATIC STATUS meta();
-STATIC STATUS move_to_char();
-STATIC STATUS h_first();
-STATIC STATUS h_last();
-STATIC STATUS h_next();
-STATIC STATUS h_prev();
-STATIC STATUS h_search();
-STATIC STATUS quote();
-STATIC STATUS transpose();
-STATIC STATUS redisplay();
-STATIC STATUS ring_bell();
-STATIC STATUS wipe();
-STATIC STATUS yank();
+STATIC STATUS accept_line(void);
+STATIC STATUS beg_line(void);
+STATIC STATUS bk_char(void);
+STATIC STATUS bk_del_char(void);
+STATIC STATUS bk_kill_word(void);
+STATIC STATUS mk_set(void);
+STATIC STATUS bk_word(void);
+STATIC STATUS fd_kill_word(void);
+STATIC STATUS fd_word(void);
+STATIC STATUS fd_char(void);
+STATIC STATUS case_down_word(void);
+STATIC STATUS case_up_word(void);
+STATIC STATUS copy_region(void);
+STATIC STATUS del_char(void);
+STATIC STATUS end_line(void);
+STATIC STATUS exchange(void);
+STATIC STATUS kill_line(void);
+STATIC STATUS last_argument(void);
+STATIC STATUS c_possible(void);
+STATIC STATUS c_complete(void);
+STATIC STATUS meta(void);
+STATIC STATUS move_to_char(void);
+STATIC STATUS h_first(void);
+STATIC STATUS h_last(void);
+STATIC STATUS h_next(void);
+STATIC STATUS h_prev(void);
+STATIC STATUS h_search(void);
+STATIC STATUS quote(void);
+STATIC STATUS transpose(void);
+STATIC STATUS redisplay(void);
+STATIC STATUS ring_bell(void);
+STATIC STATUS wipe(void);
+STATIC STATUS yank(void);
STATIC KEYMAP Map[33] = {
@@ -183,7 +183,8 @@
/*
** Declarations.
*/
-STATIC CHAR *editinput();
+STATIC CHAR *editinput(void);
+#if 0
extern int read();
extern int write();
#if defined(USE_TERMCAP)
@@ -191,13 +192,13 @@
extern char *tgetstr();
extern int tgetent();
#endif /* defined(USE_TERMCAP) */
+#endif
/*
** TTY input/output functions.
*/
-STATIC void
-TTYflush()
+STATIC void TTYflush(void)
{
if (ScreenCount) {
(void)write(1, Screen, ScreenCount);
@@ -205,9 +206,7 @@
}
}
-STATIC void
-TTYput(c)
- CHAR c;
+STATIC void TTYput(CHAR c)
{
Screen[ScreenCount] = c;
if (++ScreenCount >= ScreenSize - 1) {
@@ -216,17 +215,13 @@
}
}
-STATIC void
-TTYputs(p)
- CHAR *p;
+STATIC void TTYputs(CHAR *p)
{
while (*p)
TTYput(*p++);
}
-STATIC void
-TTYshow(c)
- CHAR c;
+STATIC void TTYshow(CHAR c)
{
if (c == DEL) {
TTYput('^');
@@ -245,16 +240,13 @@
TTYput(c);
}
-STATIC void
-TTYstring(p)
- CHAR *p;
+STATIC void TTYstring(CHAR *p)
{
while (*p)
TTYshow(*p++);
}
-STATIC unsigned int
-TTYget()
+STATIC unsigned int TTYget(void)
{
CHAR c;
@@ -270,16 +262,13 @@
#define TTYback() (backspace ? TTYputs((CHAR *)backspace) : TTYput('\b'))
-STATIC void
-TTYbackn(n)
- int n;
+STATIC void TTYbackn(int n)
{
while (--n >= 0)
TTYback();
}
-STATIC void
-TTYinfo()
+STATIC void TTYinfo(void)
{
static int init;
#if defined(USE_TERMCAP)
@@ -335,10 +324,7 @@
/*
** Print an array of words in columns.
*/
-STATIC void
-columns(ac, av)
- int ac;
- CHAR **av;
+STATIC void columns(int ac, CHAR **av)
{
CHAR *p;
int i;
@@ -368,8 +354,7 @@
}
}
-STATIC void
-reposition()
+STATIC void reposition(void)
{
int i;
CHAR *p;
@@ -380,9 +365,7 @@
TTYshow(*p);
}
-STATIC void
-left(Change)
- STATUS Change;
+STATIC void left(STATUS Change)
{
TTYback();
if (Point) {
@@ -397,26 +380,21 @@
Point--;
}
-STATIC void
-right(Change)
- STATUS Change;
+STATIC void right(STATUS Change)
{
TTYshow(Line[Point]);
if (Change == CSmove)
Point++;
}
-STATIC STATUS
-ring_bell()
+STATIC STATUS ring_bell(void)
{
TTYput('\07');
TTYflush();
return CSstay;
}
-STATIC STATUS
-do_macro(c)
- unsigned int c;
+STATIC STATUS do_macro(unsigned int c)
{
CHAR name[4];
@@ -432,9 +410,7 @@
return CSstay;
}
-STATIC STATUS
-do_forward(move)
- STATUS move;
+STATIC STATUS do_forward(STATUS move)
{
int i;
CHAR *p;
@@ -457,9 +433,7 @@
return CSstay;
}
-STATIC STATUS
-do_case(type)
- CASE type;
+STATIC STATUS do_case(CASE type)
{
int i;
int end;
@@ -486,20 +460,17 @@
return CSstay;
}
-STATIC STATUS
-case_down_word()
+STATIC STATUS case_down_word(void)
{
return do_case(TOlower);
}
-STATIC STATUS
-case_up_word()
+STATIC STATUS case_up_word(void)
{
return do_case(TOupper);
}
-STATIC void
-ceol()
+STATIC void ceol(void)
{
int extras;
int i;
@@ -522,8 +493,7 @@
TTYback();
}
-STATIC void
-clear_line()
+STATIC void clear_line(void)
{
Point = -strlen(Prompt);
TTYput('\r');
@@ -533,9 +503,7 @@
Line[0] = '\0';
}
-STATIC STATUS
-insert_string(p)
- CHAR *p;
+STATIC STATUS insert_string(CHAR *p)
{
SIZE_T len;
int i;
@@ -565,21 +533,17 @@
return Point == End ? CSstay : CSmove;
}
-STATIC CHAR *
-next_hist()
+STATIC CHAR *next_hist(void)
{
return H.Pos >= H.Size - 1 ? NULL : H.Lines[++H.Pos];
}
-STATIC CHAR *
-prev_hist()
+STATIC CHAR *prev_hist(void)
{
return H.Pos == 0 ? NULL : H.Lines[--H.Pos];
}
-STATIC STATUS
-do_insert_hist(p)
- CHAR *p;
+STATIC STATUS do_insert_hist(CHAR *p)
{
if (p == NULL)
return ring_bell();
@@ -590,9 +554,7 @@
return insert_string(p);
}
-STATIC STATUS
-do_hist(move)
- CHAR *(*move)();
+STATIC STATUS do_hist(CHAR *(*move)(void))
{
CHAR *p;
int i;
@@ -605,26 +567,22 @@
return do_insert_hist(p);
}
-STATIC STATUS
-h_next()
+STATIC STATUS h_next(void)
{
return do_hist(next_hist);
}
-STATIC STATUS
-h_prev()
+STATIC STATUS h_prev(void)
{
return do_hist(prev_hist);
}
-STATIC STATUS
-h_first()
+STATIC STATUS h_first(void)
{
return do_insert_hist(H.Lines[H.Pos = 0]);
}
-STATIC STATUS
-h_last()
+STATIC STATUS h_last(void)
{
return do_insert_hist(H.Lines[H.Pos = H.Size - 1]);
}
@@ -632,11 +590,7 @@
/*
** Return zero if pat appears as a substring in text.
*/
-STATIC int
-substrcmp(text, pat, len)
- char *text;
- char *pat;
- int len;
+STATIC int substrcmp(char *text, char *pat, int len)
{
CHAR c;
@@ -648,15 +602,12 @@
return 1;
}
-STATIC CHAR *
-search_hist(search, move)
- CHAR *search;
- CHAR *(*move)();
+STATIC CHAR *search_hist(CHAR *search, CHAR *(*move)(void))
{
static CHAR *old_search;
int len;
int pos;
- int (*match)();
+ int (*match)(char *, char *, int);
char *pat;
/* Save or get remembered search pattern. */
@@ -689,12 +640,11 @@
return NULL;
}
-STATIC STATUS
-h_search()
+STATIC STATUS h_search(void)
{
static int Searching;
CONST char *old_prompt;
- CHAR *(*move)();
+ CHAR *(*move)(void);
CHAR *p;
if (Searching)
@@ -715,8 +665,7 @@
return do_insert_hist(p);
}
-STATIC STATUS
-fd_char()
+STATIC STATUS fd_char(void)
{
int i;
@@ -729,10 +678,7 @@
return CSstay;
}
-STATIC void
-save_yank(begin, i)
- int begin;
- int i;
+STATIC void save_yank(int begin, int i)
{
if (Yanked) {
DISPOSE(Yanked);
@@ -748,9 +694,7 @@
}
}
-STATIC STATUS
-delete_string(count)
- int count;
+STATIC STATUS delete_string(int count)
{
int i;
CHAR *p;
@@ -791,8 +735,7 @@
return CSmove;
}
-STATIC STATUS
-bk_char()
+STATIC STATUS bk_char(void)
{
int i;
@@ -806,8 +749,7 @@
return CSstay;
}
-STATIC STATUS
-bk_del_char()
+STATIC STATUS bk_del_char(void)
{
int i;
@@ -821,8 +763,7 @@
return delete_string(i);
}
-STATIC STATUS
-redisplay()
+STATIC STATUS redisplay(void)
{
TTYputs((CHAR *)NEWLINE);
TTYputs((CHAR *)Prompt);
@@ -830,8 +771,7 @@
return CSmove;
}
-STATIC STATUS
-kill_line()
+STATIC STATUS kill_line(void)
{
int i;
@@ -856,9 +796,7 @@
return CSstay;
}
-STATIC STATUS
-insert_char(c)
- int c;
+STATIC STATUS insert_char(int c)
{
STATUS s;
CHAR buff[2];
@@ -883,8 +821,7 @@
return s;
}
-STATIC STATUS
-meta()
+STATIC STATUS meta(void)
{
unsigned int c;
KEYMAP *kp;
@@ -921,9 +858,7 @@
return ring_bell();
}
-STATIC STATUS
-emacs(c)
- unsigned int c;
+STATIC STATUS emacs(unsigned int c)
{
STATUS s;
KEYMAP *kp;
@@ -943,9 +878,7 @@
return s;
}
-STATIC STATUS
-TTYspecial(c)
- unsigned int c;
+STATIC STATUS TTYspecial(unsigned int c)
{
if (ISMETA(c))
return CSdispatch;
@@ -971,8 +904,7 @@
return CSdispatch;
}
-STATIC CHAR *
-editinput()
+STATIC CHAR *editinput(void)
{
unsigned int c;
@@ -1009,9 +941,7 @@
return NULL;
}
-STATIC void
-hist_add(p)
- CHAR *p;
+STATIC void hist_add(CHAR *p)
{
int i;
@@ -1032,20 +962,15 @@
** For compatibility with FSF readline.
*/
/* ARGSUSED0 */
-void
-rl_reset_terminal(p)
- char *p;
+void rl_reset_terminal(char *p)
{
}
-void
-rl_initialize()
+void rl_initialize(void)
{
}
-char *
-readline(prompt)
- CONST char *prompt;
+char *readline(CONST char *prompt)
{
CHAR *line;
@@ -1073,9 +998,7 @@
return (char *)line;
}
-void
-add_history(p)
- char *p;
+void add_history(char *p)
{
if (p == NULL || *p == '\0')
return;
@@ -1087,8 +1010,7 @@
hist_add((CHAR *)p);
}
-STATIC STATUS
-beg_line()
+STATIC STATUS beg_line(void)
{
if (Point) {
Point = 0;
@@ -1097,14 +1019,12 @@
return CSstay;
}
-STATIC STATUS
-del_char()
+STATIC STATUS del_char(void)
{
return delete_string(Repeat == NO_ARG ? 1 : Repeat);
}
-STATIC STATUS
-end_line()
+STATIC STATUS end_line(void)
{
if (Point != End) {
Point = End;
@@ -1117,8 +1037,7 @@
** Move back to the beginning of the current word and return an
** allocated copy of it.
*/
-STATIC CHAR *
-find_word()
+STATIC CHAR *find_word(void)
{
static char SEPS[] = "#;&|^$=`'{}()<>\n\t ";
CHAR *p;
@@ -1135,8 +1054,7 @@
return new;
}
-STATIC STATUS
-c_complete()
+STATIC STATUS c_complete(void)
{
CHAR *p;
CHAR *word;
@@ -1157,8 +1075,7 @@
return ring_bell();
}
-STATIC STATUS
-c_possible()
+STATIC STATUS c_possible(void)
{
CHAR **av;
CHAR *word;
@@ -1178,15 +1095,13 @@
return ring_bell();
}
-STATIC STATUS
-accept_line()
+STATIC STATUS accept_line(void)
{
Line[End] = '\0';
return CSdone;
}
-STATIC STATUS
-transpose()
+STATIC STATUS transpose(void)
{
CHAR c;
@@ -1203,16 +1118,14 @@
return CSstay;
}
-STATIC STATUS
-quote()
+STATIC STATUS quote(void)
{
unsigned int c;
return (c = TTYget()) == EOF ? CSeof : insert_char((int)c);
}
-STATIC STATUS
-wipe()
+STATIC STATUS wipe(void)
{
int i;
@@ -1229,15 +1142,13 @@
return delete_string(Mark - Point);
}
-STATIC STATUS
-mk_set()
+STATIC STATUS mk_set(void)
{
Mark = Point;
return CSstay;
}
-STATIC STATUS
-exchange()
+STATIC STATUS exchange(void)
{
unsigned int c;
@@ -1252,16 +1163,14 @@
return CSstay;
}
-STATIC STATUS
-yank()
+STATIC STATUS yank(void)
{
if (Yanked && *Yanked)
return insert_string(Yanked);
return CSstay;
}
-STATIC STATUS
-copy_region()
+STATIC STATUS copy_region(void)
{
if (Mark > End)
return ring_bell();
@@ -1274,8 +1183,7 @@
return CSstay;
}
-STATIC STATUS
-move_to_char()
+STATIC STATUS move_to_char(void)
{
unsigned int c;
int i;
@@ -1291,14 +1199,12 @@
return CSstay;
}
-STATIC STATUS
-fd_word()
+STATIC STATUS fd_word(void)
{
return do_forward(CSmove);
}
-STATIC STATUS
-fd_kill_word()
+STATIC STATUS fd_kill_word(void)
{
int i;
@@ -1311,8 +1217,7 @@
return CSstay;
}
-STATIC STATUS
-bk_word()
+STATIC STATUS bk_word(void)
{
int i;
CHAR *p;
@@ -1332,8 +1237,7 @@
return CSstay;
}
-STATIC STATUS
-bk_kill_word()
+STATIC STATUS bk_kill_word(void)
{
(void)bk_word();
if (OldPoint != Point)
@@ -1341,10 +1245,7 @@
return CSstay;
}
-STATIC int
-argify(line, avp)
- CHAR *line;
- CHAR ***avp;
+STATIC int argify(CHAR *line, CHAR ***avp)
{
CHAR *c;
CHAR **p;
@@ -1387,8 +1288,7 @@
return ac;
}
-STATIC STATUS
-last_argument()
+STATIC STATUS last_argument(void)
{
CHAR **av;
CHAR *p;
@@ -1412,4 +1312,3 @@
DISPOSE(p);
return s;
}
-
Modified: branches/marco/ports/vice/src/arch/unix/readline/sysunix.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/readline/sysunix.c 2008-05-24 01:09:08 UTC (rev 18802)
+++ branches/marco/ports/vice/src/arch/unix/readline/sysunix.c 2008-05-24 16:56:05 UTC (rev 18803)
@@ -13,9 +13,7 @@
#include <termios.h>
-void
-rl_ttyset(Reset)
- int Reset;
+void rl_ttyset(int Reset)
{
static struct termios old;
struct termios new;
@@ -43,9 +41,7 @@
#else
#include <sgtty.h>
-void
-rl_ttyset(Reset)
- int Reset;
+void rl_ttyset(int Reset)
{
static struct sgttyb old_sgttyb;
static struct tchars old_tchars;
@@ -82,14 +78,10 @@
}
#endif /* defined(HAVE_TCGETATTR) */
-void
-rl_add_slash(path, p)
- char *path;
- char *p;
+void rl_add_slash(char *path, char *p)
{
struct stat Sb;
if (stat(path, &Sb) >= 0)
(void)strcat(p, S_ISDIR(Sb.st_mode) ? "/" : " ");
}
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-05-24 01:09:05
|
Revision: 18802
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18802&view=rev
Author: blackystardust
Date: 2008-05-23 18:09:08 -0700 (Fri, 23 May 2008)
Log Message:
-----------
Fixed amigaos warnings/issues
Modified Paths:
--------------
branches/marco/ports/vice/src/arch/amigaos/catweaselmkiii.c
branches/marco/ports/vice/src/arch/amigaos/intl.c
branches/marco/ports/vice/src/arch/amigaos/joyai.c
branches/marco/ports/vice/src/arch/amigaos/mui/mui.h
branches/marco/ports/vice/src/arch/amigaos/mui/uisnapshot.c
branches/marco/ports/vice/src/arch/amigaos/mui/uivideoc128.c
branches/marco/ports/vice/src/arch/amigaos/screen-shot.c
branches/marco/ports/vice/src/arch/amigaos/video.c
branches/marco/ports/vice/src/network.c
branches/marco/ports/vice/src/sounddrv/soundvoc.c
branches/marco/ports/vice/src/sounddrv/soundwav.c
Modified: branches/marco/ports/vice/src/arch/amigaos/catweaselmkiii.c
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/catweaselmkiii.c 2008-05-23 19:50:46 UTC (rev 18801)
+++ branches/marco/ports/vice/src/arch/amigaos/catweaselmkiii.c 2008-05-24 01:09:08 UTC (rev 18802)
@@ -113,7 +113,7 @@
int catweaselmkiii_open(void)
{
static int atexitinitialized = 0;
- int i;
+ unsigned int i;
if (atexitinitialized) {
catweaselmkiii_close();
@@ -190,7 +190,7 @@
int catweaselmkiii_close(void)
{
- int i;
+ unsigned int i;
/* mute all sids */
memset(sidbuf, 0, sizeof(sidbuf));
Modified: branches/marco/ports/vice/src/arch/amigaos/intl.c
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/intl.c 2008-05-23 19:50:46 UTC (rev 18801)
+++ branches/marco/ports/vice/src/arch/amigaos/intl.c 2008-05-24 01:09:08 UTC (rev 18802)
@@ -4802,7 +4802,7 @@
static char *intl_get_string_by_id(int id)
{
- int k;
+ unsigned int k;
for (k = 0; k < countof(intl_string_table); k++)
{
@@ -4814,7 +4814,7 @@
char *intl_translate_text(int en_resource)
{
- int i;
+ unsigned int i;
for (i = 0; i < countof(intl_translate_text_table); i++)
{
@@ -4840,7 +4840,7 @@
void intl_init(void)
{
- int i,j;
+ unsigned int i,j;
for (i = 0; i < countof(language_table); i++)
{
Modified: branches/marco/ports/vice/src/arch/amigaos/joyai.c
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/joyai.c 2008-05-23 19:50:46 UTC (rev 18801)
+++ branches/marco/ports/vice/src/arch/amigaos/joyai.c 2008-05-24 01:09:08 UTC (rev 18802)
@@ -312,7 +312,7 @@
{
keysym_type *keysym = (joy == 2) ? keysym_2 : keysym_1;
char *tmp, txt[256];
- int i;
+ unsigned int i;
sprintf(txt, "JOYAI%d_ID", joy);
tmp = NULL;
@@ -335,7 +335,7 @@
{
keysym_type *keysym = (joy == 2) ? keysym_2 : keysym_1;
char tmp[256], txt[256];
- int i;
+ unsigned int i;
sprintf(txt, "JOYAI%d_ID", joy);
sprintf(tmp, "%lu", joy_id[joy-1]);
@@ -400,7 +400,7 @@
static void ai_attach(void)
{
- int i;
+ unsigned int i;
for (i=0; i<2; i++) {
get_cfg(i+1);
if ((CTX != NULL) && (joy_id[i] != -1)) {
@@ -553,7 +553,8 @@
static void update_inputs(ULONG ID)
{
char name[256];
- int i, num, offset;
+ unsigned int i;
+ int num, offset;
for (i=0; i<inputs.count; i++) {
if (inputs.names[i] != NULL) {
@@ -616,7 +617,8 @@
static int offset_to_index(int offset)
{
- int i;
+ unsigned int i;
+
for (i=0; i<inputs.count; i++) {
if ((inputs.types[i] != TYPE_NONE) && (inputs.offsets[i] == offset)) {
return i;
@@ -643,7 +645,8 @@
static int offset_to_active(int type, int offset)
{
- int i;
+ unsigned int i;
+
for (i=0; i<inputs.count; i++) {
if ((inputs.types[i] == type) && (inputs.offsets[i] == offset)) {
return i;
@@ -747,7 +750,7 @@
End;
if (app) {
- int i;
+ unsigned int i;
DoMethod(window,
MUIM_Notify, MUIA_Window_CloseRequest, TRUE,
@@ -824,7 +827,7 @@
}
if (app) {
- int i;
+ unsigned int i;
set(window, MUIA_Window_Open, TRUE);
while (running) {
unsigned long retval = DoMethod(app, MUIM_Application_Input, &signals);
@@ -898,7 +901,8 @@
}
if (AIN_ReadDevice(CTX, ai_handle[joy-1], &ptr) == TRUE) {
- int i, *data = ptr;
+ unsigend int i, *data = ptr;
+
for (i=0; i<NUM_KEYSYM; i++) {
switch (keysym[i].type) {
@@ -998,7 +1002,7 @@
{
BYTE value = 0;
keysym_type *keysym = (joy == 2) ? keysym_2 : keysym_1;
- int i;
+ unsigend int i;
for (i=0; i<NUM_KEYSYM; i++) {
if ((keysym[i].type == TYPE_NONE) && (keysym[i].rawkey == kcode)) {
Modified: branches/marco/ports/vice/src/arch/amigaos/mui/mui.h
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/mui/mui.h 2008-05-23 19:50:46 UTC (rev 18801)
+++ branches/marco/ports/vice/src/arch/amigaos/mui/mui.h 2008-05-24 01:09:08 UTC (rev 18802)
@@ -47,6 +47,9 @@
#ifdef AMIGA_MORPHOS
#include <proto/alib.h> /* for DoMethod */
#endif
+#ifdef AMIGA_M68K
+#include <clib/alib_protos.h> /* for DoMethod */
+#endif
#ifdef AMIGA_AROS
#define MUI_OBSOLETE
#endif
Modified: branches/marco/ports/vice/src/arch/amigaos/mui/uisnapshot.c
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/mui/uisnapshot.c 2008-05-23 19:50:46 UTC (rev 18801)
+++ branches/marco/ports/vice/src/arch/amigaos/mui/uisnapshot.c 2008-05-24 01:09:08 UTC (rev 18802)
@@ -60,7 +60,7 @@
static APTR build_gui(void)
{
- APTR app, ui, ok, browse_button, cancel, label;
+ APTR app, ui, ok, browse_button, cancel;
#ifdef AMIGA_MORPHOS
static const struct Hook BrowseFileHook = { { NULL,NULL },(VOID *)HookEntry,(VOID *)Browse, NULL};
Modified: branches/marco/ports/vice/src/arch/amigaos/mui/uivideoc128.c
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/mui/uivideoc128.c 2008-05-23 19:50:46 UTC (rev 18801)
+++ branches/marco/ports/vice/src/arch/amigaos/mui/uivideoc128.c 2008-05-24 01:09:08 UTC (rev 18802)
@@ -111,7 +111,7 @@
static const struct Hook BrowseVDCFileHook = { { NULL,NULL },(VOID *)HookEntry,(VOID *)BrowseVDC, NULL};
#else
static const struct Hook BrowseVICIIFileHook = { { NULL,NULL },(VOID *)BrowseVICII,NULL,NULL };
- static const struct Hook BrowseVDCFileHook = { { NULL,NULL },(VOID *)BrowseVICII,NULL,NULL };
+ static const struct Hook BrowseVDCFileHook = { { NULL,NULL },(VOID *)BrowseVDC,NULL,NULL };
#endif
app = mui_get_app();
Modified: branches/marco/ports/vice/src/arch/amigaos/screen-shot.c
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/screen-shot.c 2008-05-23 19:50:46 UTC (rev 18801)
+++ branches/marco/ports/vice/src/arch/amigaos/screen-shot.c 2008-05-24 01:09:08 UTC (rev 18802)
@@ -113,7 +113,6 @@
void ui_screenshot_dialog(video_canvas_t *canvas)
{
int format;
- char *name;
char choices[100]="";
strcat(choices,"BMP|");
Modified: branches/marco/ports/vice/src/arch/amigaos/video.c
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/video.c 2008-05-23 19:50:46 UTC (rev 18801)
+++ branches/marco/ports/vice/src/arch/amigaos/video.c 2008-05-24 01:09:08 UTC (rev 18802)
@@ -515,7 +515,9 @@
}
}
else {
+#if defined(HAVE_PROTO_CYBERGRAPHICS_H) && defined(HAVE_XVIDEO)
reopenwindow:
+#endif
/* if window already is open, just resize it, otherwise, open it */
if (canvas->os->window != NULL) {
ChangeWindowBox(canvas->os->window,
@@ -951,6 +953,7 @@
return c;
}
+#ifdef HAVE_PROTO_CYBERGRAPHICS_H
static int makecol_BGR565BE(int r, int g, int b)
{
int c = ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3);
@@ -962,6 +965,7 @@
int c = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
return c;
}
+#endif
static int makecol_BGR555BE(int r, int g, int b)
{
@@ -1110,7 +1114,7 @@
struct palette_s *palette)
{
int (*makecol)(int r, int g, int b);
- int i;
+ unsigned int i;
int col;
canvas->palette = palette;
Modified: branches/marco/ports/vice/src/network.c
===================================================================
--- branches/marco/ports/vice/src/network.c 2008-05-23 19:50:46 UTC (rev 18801)
+++ branches/marco/ports/vice/src/network.c 2008-05-24 01:09:08 UTC (rev 18802)
@@ -56,7 +56,7 @@
#define __USE_INLINE__
#include <proto/bsdsocket.h>
#endif
-#ifndef AMIGA_AROS
+#if !defined(AMIGA_AROS) && !defined(AMIGA_MORPHOS)
#define select(nfds, read_fds, write_fds, except_fds, timeout) \
WaitSelect(nfds, read_fds, write_fds, except_fds, timeout, NULL)
#endif
Modified: branches/marco/ports/vice/src/sounddrv/soundvoc.c
===================================================================
--- branches/marco/ports/vice/src/sounddrv/soundvoc.c 2008-05-23 19:50:46 UTC (rev 18801)
+++ branches/marco/ports/vice/src/sounddrv/soundvoc.c 2008-05-24 01:09:08 UTC (rev 18802)
@@ -79,7 +79,7 @@
BYTE extra_block_header[] = "\002sss";
#ifdef WORDS_BIGENDIAN
- int i;
+ unsigned int i;
/* Swap bytes on big endian machines. */
for (i=0; i<nr; i++)
Modified: branches/marco/ports/vice/src/sounddrv/soundwav.c
===================================================================
--- branches/marco/ports/vice/src/sounddrv/soundwav.c 2008-05-23 19:50:46 UTC (rev 18801)
+++ branches/marco/ports/vice/src/sounddrv/soundwav.c 2008-05-24 01:09:08 UTC (rev 18802)
@@ -74,7 +74,7 @@
static int wav_write(SWORD *pbuf, size_t nr)
{
#ifdef WORDS_BIGENDIAN
- int i;
+ unsigned int i;
/* Swap bytes on big endian machines. */
for (i = 0; i < nr; i++) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cnv...@us...> - 2008-05-23 19:50:47
|
Revision: 18801
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18801&view=rev
Author: cnvogelg
Date: 2008-05-23 12:50:46 -0700 (Fri, 23 May 2008)
Log Message:
-----------
chris/cocoa-port: added VICE.xcodeproj to simplify nib file management
Added Paths:
-----------
branches/chris/cocoa-port/vice/src/arch/unix/macosx/VICE.xcodeproj/
branches/chris/cocoa-port/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj
Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj (rev 0)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/VICE.xcodeproj/project.pbxproj 2008-05-23 19:50:46 UTC (rev 18801)
@@ -0,0 +1,628 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 42;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 83E499CD0DE4CA54001DE90F /* IECDriveSettings.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E4997B0DE4C8C8001DE90F /* IECDriveSettings.nib */; };
+ 83E499CE0DE4CA54001DE90F /* SoundSettings.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E4998D0DE4C8C8001DE90F /* SoundSettings.nib */; };
+ 83E499CF0DE4CA54001DE90F /* KeyboardSettings.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E4997F0DE4C8C8001DE90F /* KeyboardSettings.nib */; };
+ 83E499D00DE4CA54001DE90F /* DriveSettings.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E499790DE4C8C8001DE90F /* DriveSettings.nib */; };
+ 83E499D20DE4CA54001DE90F /* PrinterSettings.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E499850DE4C8C8001DE90F /* PrinterSettings.nib */; };
+ 83E499D30DE4CA54001DE90F /* VICEInformation.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E4998F0DE4C8C8001DE90F /* VICEInformation.nib */; };
+ 83E499D40DE4CA54001DE90F /* ResourceEditor.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E499890DE4C8C8001DE90F /* ResourceEditor.nib */; };
+ 83E499D50DE4CA54001DE90F /* x64.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E499910DE4C8C8001DE90F /* x64.nib */; };
+ 83E499D60DE4CA54001DE90F /* JoystickSettings.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E4997D0DE4C8C8001DE90F /* JoystickSettings.nib */; };
+ 83E49A3F0DE4CCA9001DE90F /* console.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499E40DE4CCA9001DE90F /* console.m */; };
+ 83E49A400DE4CCA9001DE90F /* drivesettingswindowcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499E70DE4CCA9001DE90F /* drivesettingswindowcontroller.m */; };
+ 83E49A410DE4CCA9001DE90F /* iecdrivesettingswindowcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499E90DE4CCA9001DE90F /* iecdrivesettingswindowcontroller.m */; };
+ 83E49A420DE4CCA9001DE90F /* joysticksettingswindowcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499EB0DE4CCA9001DE90F /* joysticksettingswindowcontroller.m */; };
+ 83E49A430DE4CCA9001DE90F /* keyboardsettingswindowcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499ED0DE4CCA9001DE90F /* keyboardsettingswindowcontroller.m */; };
+ 83E49A440DE4CCA9001DE90F /* Makefile.am in Resources */ = {isa = PBXBuildFile; fileRef = 83E499EE0DE4CCA9001DE90F /* Makefile.am */; };
+ 83E49A460DE4CCA9001DE90F /* printersettingswindowcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499F10DE4CCA9001DE90F /* printersettingswindowcontroller.m */; };
+ 83E49A470DE4CCA9001DE90F /* resourceeditorcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499F30DE4CCA9001DE90F /* resourceeditorcontroller.m */; };
+ 83E49A480DE4CCA9001DE90F /* resourcetreeitem.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499F50DE4CCA9001DE90F /* resourcetreeitem.m */; };
+ 83E49A490DE4CCA9001DE90F /* soundsettingswindowcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499F70DE4CCA9001DE90F /* soundsettingswindowcontroller.m */; };
+ 83E49A4A0DE4CCA9001DE90F /* viceinformationwindowcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499F90DE4CCA9001DE90F /* viceinformationwindowcontroller.m */; };
+ 83E49A4B0DE4CCA9001DE90F /* viceresourcewindowcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499FB0DE4CCA9001DE90F /* viceresourcewindowcontroller.m */; };
+ 83E49A4C0DE4CCA9001DE90F /* fullscreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499FC0DE4CCA9001DE90F /* fullscreen.m */; };
+ 83E49A4D0DE4CCA9001DE90F /* kbd.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499FE0DE4CCA9001DE90F /* kbd.m */; };
+ 83E49A4E0DE4CCA9001DE90F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E499FF0DE4CCA9001DE90F /* main.m */; };
+ 83E49A4F0DE4CCA9001DE90F /* Makefile.am in Resources */ = {isa = PBXBuildFile; fileRef = 83E49A000DE4CCA9001DE90F /* Makefile.am */; };
+ 83E49A510DE4CCA9001DE90F /* c128controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A040DE4CCA9001DE90F /* c128controller.m */; };
+ 83E49A520DE4CCA9001DE90F /* c128machinecontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A060DE4CCA9001DE90F /* c128machinecontroller.m */; };
+ 83E49A530DE4CCA9001DE90F /* c128ui.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A070DE4CCA9001DE90F /* c128ui.m */; };
+ 83E49A540DE4CCA9001DE90F /* c64controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A090DE4CCA9001DE90F /* c64controller.m */; };
+ 83E49A550DE4CCA9001DE90F /* c64machinecontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A0B0DE4CCA9001DE90F /* c64machinecontroller.m */; };
+ 83E49A560DE4CCA9001DE90F /* c64ui.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A0C0DE4CCA9001DE90F /* c64ui.m */; };
+ 83E49A570DE4CCA9001DE90F /* cbm2ui.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A0D0DE4CCA9001DE90F /* cbm2ui.m */; };
+ 83E49A580DE4CCA9001DE90F /* Makefile.am in Resources */ = {isa = PBXBuildFile; fileRef = 83E49A0E0DE4CCA9001DE90F /* Makefile.am */; };
+ 83E49A5A0DE4CCA9001DE90F /* petui.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A100DE4CCA9001DE90F /* petui.m */; };
+ 83E49A5B0DE4CCA9001DE90F /* plus4ui.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A110DE4CCA9001DE90F /* plus4ui.m */; };
+ 83E49A5C0DE4CCA9001DE90F /* vic20ui.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A120DE4CCA9001DE90F /* vic20ui.m */; };
+ 83E49A5D0DE4CCA9001DE90F /* viceappcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A140DE4CCA9001DE90F /* viceappcontroller.m */; };
+ 83E49A5E0DE4CCA9001DE90F /* vicemachinecontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A160DE4CCA9001DE90F /* vicemachinecontroller.m */; };
+ 83E49A5F0DE4CCA9001DE90F /* mousedrv.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A170DE4CCA9001DE90F /* mousedrv.m */; };
+ 83E49A600DE4CCA9001DE90F /* ui-cmdline-options.c in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A180DE4CCA9001DE90F /* ui-cmdline-options.c */; };
+ 83E49A610DE4CCA9001DE90F /* ui-resources.c in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A190DE4CCA9001DE90F /* ui-resources.c */; };
+ 83E49A620DE4CCA9001DE90F /* ui.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A1A0DE4CCA9001DE90F /* ui.m */; };
+ 83E49A630DE4CCA9001DE90F /* uimon.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A1B0DE4CCA9001DE90F /* uimon.m */; };
+ 83E49A640DE4CCA9001DE90F /* viceapplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A1D0DE4CCA9001DE90F /* viceapplication.m */; };
+ 83E49A650DE4CCA9001DE90F /* vicemachine.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A200DE4CCA9001DE90F /* vicemachine.m */; };
+ 83E49A660DE4CCA9001DE90F /* vicemachinenotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A220DE4CCA9001DE90F /* vicemachinenotifier.m */; };
+ 83E49A670DE4CCA9001DE90F /* video.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A250DE4CCA9001DE90F /* video.m */; };
+ 83E49A680DE4CCA9001DE90F /* consolewindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A290DE4CCA9001DE90F /* consolewindow.m */; };
+ 83E49A690DE4CCA9001DE90F /* driveview.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A2B0DE4CCA9001DE90F /* driveview.m */; };
+ 83E49A6A0DE4CCA9001DE90F /* fullscreenwindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A2D0DE4CCA9001DE90F /* fullscreenwindow.m */; };
+ 83E49A6B0DE4CCA9001DE90F /* joystickview.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A2F0DE4CCA9001DE90F /* joystickview.m */; };
+ 83E49A6C0DE4CCA9001DE90F /* keypressview.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A310DE4CCA9001DE90F /* keypressview.m */; };
+ 83E49A6D0DE4CCA9001DE90F /* logview.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A330DE4CCA9001DE90F /* logview.m */; };
+ 83E49A6E0DE4CCA9001DE90F /* Makefile.am in Resources */ = {isa = PBXBuildFile; fileRef = 83E49A340DE4CCA9001DE90F /* Makefile.am */; };
+ 83E49A700DE4CCA9001DE90F /* peripheraldrawer.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A370DE4CCA9001DE90F /* peripheraldrawer.m */; };
+ 83E49A710DE4CCA9001DE90F /* tapeview.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A390DE4CCA9001DE90F /* tapeview.m */; };
+ 83E49A720DE4CCA9001DE90F /* viceglview.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A3B0DE4CCA9001DE90F /* viceglview.m */; };
+ 83E49A730DE4CCA9001DE90F /* vicewindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A3D0DE4CCA9001DE90F /* vicewindow.m */; };
+ 83E49A740DE4CCA9001DE90F /* vsidui.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A3E0DE4CCA9001DE90F /* vsidui.m */; };
+ 83E49A830DE6B688001DE90F /* recordmediawindowcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E49A820DE6B688001DE90F /* recordmediawindowcontroller.m */; };
+ 83E49A880DE6B6AA001DE90F /* RecordMedia.nib in Resources */ = {isa = PBXBuildFile; fileRef = 83E49A860DE6B6AA001DE90F /* RecordMedia.nib */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+ 83E4997A0DE4C8C8001DE90F /* English */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = English; path = DriveSettings.nib; sourceTree = "<group>"; };
+ 83E4997C0DE4C8C8001DE90F /* English */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = English; path = IECDriveSettings.nib; sourceTree = "<group>"; };
+ 83E4997E0DE4C8C8001DE90F /* English */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = English; path = JoystickSettings.nib; sourceTree = "<group>"; };
+ 83E499800DE4C8C8001DE90F /* English */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = English; path = KeyboardSettings.nib; sourceTree = "<group>"; };
+ 83E499860DE4C8C8001DE90F /* English */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = English; path = PrinterSettings.nib; sourceTree = "<group>"; };
+ 83E4998A0DE4C8C8001DE90F /* English */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = English; path = ResourceEditor.nib; sourceTree = "<group>"; };
+ 83E4998E0DE4C8C8001DE90F /* English */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = English; path = SoundSettings.nib; sourceTree = "<group>"; };
+ 83E499900DE4C8C8001DE90F /* English */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = English; path = VICEInformation.nib; sourceTree = "<group>"; };
+ 83E499920DE4C8C8001DE90F /* English */ = {isa = PBXFileReference; explicitFileType = wrapper.nib; name = English; path = x64.nib; sourceTree = "<group>"; };
+ 83E499C70DE4CA1B001DE90F /* VICE.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VICE.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 83E499E40DE4CCA9001DE90F /* console.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = console.m; sourceTree = "<group>"; };
+ 83E499E60DE4CCA9001DE90F /* drivesettingswindowcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = drivesettingswindowcontroller.h; sourceTree = "<group>"; };
+ 83E499E70DE4CCA9001DE90F /* drivesettingswindowcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = drivesettingswindowcontroller.m; sourceTree = "<group>"; };
+ 83E499E80DE4CCA9001DE90F /* iecdrivesettingswindowcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iecdrivesettingswindowcontroller.h; sourceTree = "<group>"; };
+ 83E499E90DE4CCA9001DE90F /* iecdrivesettingswindowcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iecdrivesettingswindowcontroller.m; sourceTree = "<group>"; };
+ 83E499EA0DE4CCA9001DE90F /* joysticksettingswindowcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = joysticksettingswindowcontroller.h; sourceTree = "<group>"; };
+ 83E499EB0DE4CCA9001DE90F /* joysticksettingswindowcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = joysticksettingswindowcontroller.m; sourceTree = "<group>"; };
+ 83E499EC0DE4CCA9001DE90F /* keyboardsettingswindowcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyboardsettingswindowcontroller.h; sourceTree = "<group>"; };
+ 83E499ED0DE4CCA9001DE90F /* keyboardsettingswindowcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = keyboardsettingswindowcontroller.m; sourceTree = "<group>"; };
+ 83E499EE0DE4CCA9001DE90F /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
+ 83E499F00DE4CCA9001DE90F /* printersettingswindowcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = printersettingswindowcontroller.h; sourceTree = "<group>"; };
+ 83E499F10DE4CCA9001DE90F /* printersettingswindowcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = printersettingswindowcontroller.m; sourceTree = "<group>"; };
+ 83E499F20DE4CCA9001DE90F /* resourceeditorcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resourceeditorcontroller.h; sourceTree = "<group>"; };
+ 83E499F30DE4CCA9001DE90F /* resourceeditorcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = resourceeditorcontroller.m; sourceTree = "<group>"; };
+ 83E499F40DE4CCA9001DE90F /* resourcetreeitem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resourcetreeitem.h; sourceTree = "<group>"; };
+ 83E499F50DE4CCA9001DE90F /* resourcetreeitem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = resourcetreeitem.m; sourceTree = "<group>"; };
+ 83E499F60DE4CCA9001DE90F /* soundsettingswindowcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = soundsettingswindowcontroller.h; sourceTree = "<group>"; };
+ 83E499F70DE4CCA9001DE90F /* soundsettingswindowcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = soundsettingswindowcontroller.m; sourceTree = "<group>"; };
+ 83E499F80DE4CCA9001DE90F /* viceinformationwindowcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = viceinformationwindowcontroller.h; sourceTree = "<group>"; };
+ 83E499F90DE4CCA9001DE90F /* viceinformationwindowcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = viceinformationwindowcontroller.m; sourceTree = "<group>"; };
+ 83E499FA0DE4CCA9001DE90F /* viceresourcewindowcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = viceresourcewindowcontroller.h; sourceTree = "<group>"; };
+ 83E499FB0DE4CCA9001DE90F /* viceresourcewindowcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = viceresourcewindowcontroller.m; sourceTree = "<group>"; };
+ 83E499FC0DE4CCA9001DE90F /* fullscreen.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = fullscreen.m; sourceTree = "<group>"; };
+ 83E499FD0DE4CCA9001DE90F /* kbd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kbd.h; sourceTree = "<group>"; };
+ 83E499FE0DE4CCA9001DE90F /* kbd.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = kbd.m; sourceTree = "<group>"; };
+ 83E499FF0DE4CCA9001DE90F /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+ 83E49A000DE4CCA9001DE90F /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
+ 83E49A030DE4CCA9001DE90F /* c128controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c128controller.h; sourceTree = "<group>"; };
+ 83E49A040DE4CCA9001DE90F /* c128controller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = c128controller.m; sourceTree = "<group>"; };
+ 83E49A050DE4CCA9001DE90F /* c128machinecontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c128machinecontroller.h; sourceTree = "<group>"; };
+ 83E49A060DE4CCA9001DE90F /* c128machinecontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = c128machinecontroller.m; sourceTree = "<group>"; };
+ 83E49A070DE4CCA9001DE90F /* c128ui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = c128ui.m; sourceTree = "<group>"; };
+ 83E49A080DE4CCA9001DE90F /* c64controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c64controller.h; sourceTree = "<group>"; };
+ 83E49A090DE4CCA9001DE90F /* c64controller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = c64controller.m; sourceTree = "<group>"; };
+ 83E49A0A0DE4CCA9001DE90F /* c64machinecontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c64machinecontroller.h; sourceTree = "<group>"; };
+ 83E49A0B0DE4CCA9001DE90F /* c64machinecontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = c64machinecontroller.m; sourceTree = "<group>"; };
+ 83E49A0C0DE4CCA9001DE90F /* c64ui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = c64ui.m; sourceTree = "<group>"; };
+ 83E49A0D0DE4CCA9001DE90F /* cbm2ui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = cbm2ui.m; sourceTree = "<group>"; };
+ 83E49A0E0DE4CCA9001DE90F /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
+ 83E49A100DE4CCA9001DE90F /* petui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = petui.m; sourceTree = "<group>"; };
+ 83E49A110DE4CCA9001DE90F /* plus4ui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = plus4ui.m; sourceTree = "<group>"; };
+ 83E49A120DE4CCA9001DE90F /* vic20ui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = vic20ui.m; sourceTree = "<group>"; };
+ 83E49A130DE4CCA9001DE90F /* viceappcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = viceappcontroller.h; sourceTree = "<group>"; };
+ 83E49A140DE4CCA9001DE90F /* viceappcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = viceappcontroller.m; sourceTree = "<group>"; };
+ 83E49A150DE4CCA9001DE90F /* vicemachinecontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vicemachinecontroller.h; sourceTree = "<group>"; };
+ 83E49A160DE4CCA9001DE90F /* vicemachinecontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = vicemachinecontroller.m; sourceTree = "<group>"; };
+ 83E49A170DE4CCA9001DE90F /* mousedrv.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mousedrv.m; sourceTree = "<group>"; };
+ 83E49A180DE4CCA9001DE90F /* ui-cmdline-options.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "ui-cmdline-options.c"; sourceTree = "<group>"; };
+ 83E49A190DE4CCA9001DE90F /* ui-resources.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "ui-resources.c"; sourceTree = "<group>"; };
+ 83E49A1A0DE4CCA9001DE90F /* ui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ui.m; sourceTree = "<group>"; };
+ 83E49A1B0DE4CCA9001DE90F /* uimon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = uimon.m; sourceTree = "<group>"; };
+ 83E49A1C0DE4CCA9001DE90F /* viceapplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = viceapplication.h; sourceTree = "<group>"; };
+ 83E49A1D0DE4CCA9001DE90F /* viceapplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = viceapplication.m; sourceTree = "<group>"; };
+ 83E49A1E0DE4CCA9001DE90F /* viceapplicationprotocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = viceapplicationprotocol.h; sourceTree = "<group>"; };
+ 83E49A1F0DE4CCA9001DE90F /* vicemachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vicemachine.h; sourceTree = "<group>"; };
+ 83E49A200DE4CCA9001DE90F /* vicemachine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = vicemachine.m; sourceTree = "<group>"; };
+ 83E49A210DE4CCA9001DE90F /* vicemachinenotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vicemachinenotifier.h; sourceTree = "<group>"; };
+ 83E49A220DE4CCA9001DE90F /* vicemachinenotifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = vicemachinenotifier.m; sourceTree = "<group>"; };
+ 83E49A230DE4CCA9001DE90F /* vicemachineprotocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vicemachineprotocol.h; sourceTree = "<group>"; };
+ 83E49A240DE4CCA9001DE90F /* vicenotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vicenotifications.h; sourceTree = "<group>"; };
+ 83E49A250DE4CCA9001DE90F /* video.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = video.m; sourceTree = "<group>"; };
+ 83E49A260DE4CCA9001DE90F /* videoarch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = videoarch.h; sourceTree = "<group>"; };
+ 83E49A280DE4CCA9001DE90F /* consolewindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = consolewindow.h; sourceTree = "<group>"; };
+ 83E49A290DE4CCA9001DE90F /* consolewindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = consolewindow.m; sourceTree = "<group>"; };
+ 83E49A2A0DE4CCA9001DE90F /* driveview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = driveview.h; sourceTree = "<group>"; };
+ 83E49A2B0DE4CCA9001DE90F /* driveview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = driveview.m; sourceTree = "<group>"; };
+ 83E49A2C0DE4CCA9001DE90F /* fullscreenwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fullscreenwindow.h; sourceTree = "<group>"; };
+ 83E49A2D0DE4CCA9001DE90F /* fullscreenwindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = fullscreenwindow.m; sourceTree = "<group>"; };
+ 83E49A2E0DE4CCA9001DE90F /* joystickview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = joystickview.h; sourceTree = "<group>"; };
+ 83E49A2F0DE4CCA9001DE90F /* joystickview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = joystickview.m; sourceTree = "<group>"; };
+ 83E49A300DE4CCA9001DE90F /* keypressview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keypressview.h; sourceTree = "<group>"; };
+ 83E49A310DE4CCA9001DE90F /* keypressview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = keypressview.m; sourceTree = "<group>"; };
+ 83E49A320DE4CCA9001DE90F /* logview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logview.h; sourceTree = "<group>"; };
+ 83E49A330DE4CCA9001DE90F /* logview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = logview.m; sourceTree = "<group>"; };
+ 83E49A340DE4CCA9001DE90F /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
+ 83E49A360DE4CCA9001DE90F /* peripheraldrawer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = peripheraldrawer.h; sourceTree = "<group>"; };
+ 83E49A370DE4CCA9001DE90F /* peripheraldrawer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = peripheraldrawer.m; sourceTree = "<group>"; };
+ 83E49A380DE4CCA9001DE90F /* tapeview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tapeview.h; sourceTree = "<group>"; };
+ 83E49A390DE4CCA9001DE90F /* tapeview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = tapeview.m; sourceTree = "<group>"; };
+ 83E49A3A0DE4CCA9001DE90F /* viceglview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = viceglview.h; sourceTree = "<group>"; };
+ 83E49A3B0DE4CCA9001DE90F /* viceglview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = viceglview.m; sourceTree = "<group>"; };
+ 83E49A3C0DE4CCA9001DE90F /* vicewindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vicewindow.h; sourceTree = "<group>"; };
+ 83E49A3D0DE4CCA9001DE90F /* vicewindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = vicewindow.m; sourceTree = "<group>"; };
+ 83E49A3E0DE4CCA9001DE90F /* vsidui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = vsidui.m; sourceTree = "<group>"; };
+ 83E49A810DE6B688001DE90F /* recordmediawindowcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = recordmediawindowcontroller.h; sourceTree = "<group>"; };
+ 83E49A820DE6B688001DE90F /* recordmediawindowcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = recordmediawindowcontroller.m; sourceTree = "<group>"; };
+ 83E49A870DE6B6AA001DE90F /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = RecordMedia.nib; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ 83E499C50DE4CA1B001DE90F /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 83E4995C0DE4C808001DE90F = {
+ isa = PBXGroup;
+ children = (
+ 83E499E30DE4CCA9001DE90F /* cocoa */,
+ 83E499780DE4C8C8001DE90F /* English.lproj */,
+ 83E499A60DE4C96B001DE90F /* Products */,
+ );
+ sourceTree = "<group>";
+ };
+ 83E499780DE4C8C8001DE90F /* English.lproj */ = {
+ isa = PBXGroup;
+ children = (
+ 83E49A860DE6B6AA001DE90F /* RecordMedia.nib */,
+ 83E499790DE4C8C8001DE90F /* DriveSettings.nib */,
+ 83E4997B0DE4C8C8001DE90F /* IECDriveSettings.nib */,
+ 83E4997D0DE4C8C8001DE90F /* JoystickSettings.nib */,
+ 83E4997F0DE4C8C8001DE90F /* KeyboardSettings.nib */,
+ 83E499850DE4C8C8001DE90F /* PrinterSettings.nib */,
+ 83E499890DE4C8C8001DE90F /* ResourceEditor.nib */,
+ 83E4998D0DE4C8C8001DE90F /* SoundSettings.nib */,
+ 83E4998F0DE4C8C8001DE90F /* VICEInformation.nib */,
+ 83E499910DE4C8C8001DE90F /* x64.nib */,
+ );
+ name = English.lproj;
+ path = Resources/English.lproj;
+ sourceTree = "<group>";
+ };
+ 83E499A60DE4C96B001DE90F /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 83E499C70DE4CA1B001DE90F /* VICE.app */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ 83E499E30DE4CCA9001DE90F /* cocoa */ = {
+ isa = PBXGroup;
+ children = (
+ 83E499E40DE4CCA9001DE90F /* console.m */,
+ 83E499E50DE4CCA9001DE90F /* dialog */,
+ 83E499FC0DE4CCA9001DE90F /* fullscreen.m */,
+ 83E499FD0DE4CCA9001DE90F /* kbd.h */,
+ 83E499FE0DE4CCA9001DE90F /* kbd.m */,
+ 83E499FF0DE4CCA9001DE90F /* main.m */,
+ 83E49A000DE4CCA9001DE90F /* Makefile.am */,
+ 83E49A020DE4CCA9001DE90F /* menu */,
+ 83E49A170DE4CCA9001DE90F /* mousedrv.m */,
+ 83E49A180DE4CCA9001DE90F /* ui-cmdline-options.c */,
+ 83E49A190DE4CCA9001DE90F /* ui-resources.c */,
+ 83E49A1A0DE4CCA9001DE90F /* ui.m */,
+ 83E49A1B0DE4CCA9001DE90F /* uimon.m */,
+ 83E49A1C0DE4CCA9001DE90F /* viceapplication.h */,
+ 83E49A1D0DE4CCA9001DE90F /* viceapplication.m */,
+ 83E49A1E0DE4CCA9001DE90F /* viceapplicationprotocol.h */,
+ 83E49A1F0DE4CCA9001DE90F /* vicemachine.h */,
+ 83E49A200DE4CCA9001DE90F /* vicemachine.m */,
+ 83E49A210DE4CCA9001DE90F /* vicemachinenotifier.h */,
+ 83E49A220DE4CCA9001DE90F /* vicemachinenotifier.m */,
+ 83E49A230DE4CCA9001DE90F /* vicemachineprotocol.h */,
+ 83E49A240DE4CCA9001DE90F /* vicenotifications.h */,
+ 83E49A250DE4CCA9001DE90F /* video.m */,
+ 83E49A260DE4CCA9001DE90F /* videoarch.h */,
+ 83E49A270DE4CCA9001DE90F /* view */,
+ 83E49A3E0DE4CCA9001DE90F /* vsidui.m */,
+ );
+ path = cocoa;
+ sourceTree = "<group>";
+ };
+ 83E499E50DE4CCA9001DE90F /* dialog */ = {
+ isa = PBXGroup;
+ children = (
+ 83E49A810DE6B688001DE90F /* recordmediawindowcontroller.h */,
+ 83E49A820DE6B688001DE90F /* recordmediawindowcontroller.m */,
+ 83E499E60DE4CCA9001DE90F /* drivesettingswindowcontroller.h */,
+ 83E499E70DE4CCA9001DE90F /* drivesettingswindowcontroller.m */,
+ 83E499E80DE4CCA9001DE90F /* iecdrivesettingswindowcontroller.h */,
+ 83E499E90DE4CCA9001DE90F /* iecdrivesettingswindowcontroller.m */,
+ 83E499EA0DE4CCA9001DE90F /* joysticksettingswindowcontroller.h */,
+ 83E499EB0DE4CCA9001DE90F /* joysticksettingswindowcontroller.m */,
+ 83E499EC0DE4CCA9001DE90F /* keyboardsettingswindowcontroller.h */,
+ 83E499ED0DE4CCA9001DE90F /* keyboardsettingswindowcontroller.m */,
+ 83E499EE0DE4CCA9001DE90F /* Makefile.am */,
+ 83E499F00DE4CCA9001DE90F /* printersettingswindowcontroller.h */,
+ 83E499F10DE4CCA9001DE90F /* printersettingswindowcontroller.m */,
+ 83E499F20DE4CCA9001DE90F /* resourceeditorcontroller.h */,
+ 83E499F30DE4CCA9001DE90F /* resourceeditorcontroller.m */,
+ 83E499F40DE4CCA9001DE90F /* resourcetreeitem.h */,
+ 83E499F50DE4CCA9001DE90F /* resourcetreeitem.m */,
+ 83E499F60DE4CCA9001DE90F /* soundsettingswindowcontroller.h */,
+ 83E499F70DE4CCA9001DE90F /* soundsettingswindowcontroller.m */,
+ 83E499F80DE4CCA9001DE90F /* viceinformationwindowcontroller.h */,
+ 83E499F90DE4CCA9001DE90F /* viceinformationwindowcontroller.m */,
+ 83E499FA0DE4CCA9001DE90F /* viceresourcewindowcontroller.h */,
+ 83E499FB0DE4CCA9001DE90F /* viceresourcewindowcontroller.m */,
+ );
+ path = dialog;
+ sourceTree = "<group>";
+ };
+ 83E49A020DE4CCA9001DE90F /* menu */ = {
+ isa = PBXGroup;
+ children = (
+ 83E49A030DE4CCA9001DE90F /* c128controller.h */,
+ 83E49A040DE4CCA9001DE90F /* c128controller.m */,
+ 83E49A050DE4CCA9001DE90F /* c128machinecontroller.h */,
+ 83E49A060DE4CCA9001DE90F /* c128machinecontroller.m */,
+ 83E49A070DE4CCA9001DE90F /* c128ui.m */,
+ 83E49A080DE4CCA9001DE90F /* c64controller.h */,
+ 83E49A090DE4CCA9001DE90F /* c64controller.m */,
+ 83E49A0A0DE4CCA9001DE90F /* c64machinecontroller.h */,
+ 83E49A0B0DE4CCA9001DE90F /* c64machinecontroller.m */,
+ 83E49A0C0DE4CCA9001DE90F /* c64ui.m */,
+ 83E49A0D0DE4CCA9001DE90F /* cbm2ui.m */,
+ 83E49A0E0DE4CCA9001DE90F /* Makefile.am */,
+ 83E49A100DE4CCA9001DE90F /* petui.m */,
+ 83E49A110DE4CCA9001DE90F /* plus4ui.m */,
+ 83E49A120DE4CCA9001DE90F /* vic20ui.m */,
+ 83E49A130DE4CCA9001DE90F /* viceappcontroller.h */,
+ 83E49A140DE4CCA9001DE90F /* viceappcontroller.m */,
+ 83E49A150DE4CCA9001DE90F /* vicemachinecontroller.h */,
+ 83E49A160DE4CCA9001DE90F /* vicemachinecontroller.m */,
+ );
+ path = menu;
+ sourceTree = "<group>";
+ };
+ 83E49A270DE4CCA9001DE90F /* view */ = {
+ isa = PBXGroup;
+ children = (
+ 83E49A280DE4CCA9001DE90F /* consolewindow.h */,
+ 83E49A290DE4CCA9001DE90F /* consolewindow.m */,
+ 83E49A2A0DE4CCA9001DE90F /* driveview.h */,
+ 83E49A2B0DE4CCA9001DE90F /* driveview.m */,
+ 83E49A2C0DE4CCA9001DE90F /* fullscreenwindow.h */,
+ 83E49A2D0DE4CCA9001DE90F /* fullscreenwindow.m */,
+ 83E49A2E0DE4CCA9001DE90F /* joystickview.h */,
+ 83E49A2F0DE4CCA9001DE90F /* joystickview.m */,
+ 83E49A300DE4CCA9001DE90F /* keypressview.h */,
+ 83E49A310DE4CCA9001DE90F /* keypressview.m */,
+ 83E49A320DE4CCA9001DE90F /* logview.h */,
+ 83E49A330DE4CCA9001DE90F /* logview.m */,
+ 83E49A340DE4CCA9001DE90F /* Makefile.am */,
+ 83E49A360DE4CCA9001DE90F /* peripheraldrawer.h */,
+ 83E49A370DE4CCA9001DE90F /* peripheraldrawer.m */,
+ 83E49A380DE4CCA9001DE90F /* tapeview.h */,
+ 83E49A390DE4CCA9001DE90F /* tapeview.m */,
+ 83E49A3A0DE4CCA9001DE90F /* viceglview.h */,
+ 83E49A3B0DE4CCA9001DE90F /* viceglview.m */,
+ 83E49A3C0DE4CCA9001DE90F /* vicewindow.h */,
+ 83E49A3D0DE4CCA9001DE90F /* vicewindow.m */,
+ );
+ path = view;
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+ 83E499C60DE4CA1B001DE90F /* VICE */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 83E499CC0DE4CA1C001DE90F /* Build configuration list for PBXNativeTarget "VICE" */;
+ buildPhases = (
+ 83E499C30DE4CA1B001DE90F /* Resources */,
+ 83E499C40DE4CA1B001DE90F /* Sources */,
+ 83E499C50DE4CA1B001DE90F /* Frameworks */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = VICE;
+ productName = VICE;
+ productReference = 83E499C70DE4CA1B001DE90F /* VICE.app */;
+ productType = "com.apple.product-type.application";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ 83E4995E0DE4C808001DE90F /* Project object */ = {
+ isa = PBXProject;
+ buildConfigurationList = 83E499610DE4C808001DE90F /* Build configuration list for PBXProject "VICE" */;
+ compatibilityVersion = "Xcode 2.4";
+ hasScannedForEncodings = 0;
+ mainGroup = 83E4995C0DE4C808001DE90F;
+ productRefGroup = 83E499A60DE4C96B001DE90F /* Products */;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ 83E499C60DE4CA1B001DE90F /* VICE */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+ 83E499C30DE4CA1B001DE90F /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 83E499CD0DE4CA54001DE90F /* IECDriveSettings.nib in Resources */,
+ 83E499CE0DE4CA54001DE90F /* SoundSettings.nib in Resources */,
+ 83E499CF0DE4CA54001DE90F /* KeyboardSettings.nib in Resources */,
+ 83E499D00DE4CA54001DE90F /* DriveSettings.nib in Resources */,
+ 83E499D20DE4CA54001DE90F /* PrinterSettings.nib in Resources */,
+ 83E499D30DE4CA54001DE90F /* VICEInformation.nib in Resources */,
+ 83E499D40DE4CA54001DE90F /* ResourceEditor.nib in Resources */,
+ 83E499D50DE4CA54001DE90F /* x64.nib in Resources */,
+ 83E499D60DE4CA54001DE90F /* JoystickSettings.nib in Resources */,
+ 83E49A440DE4CCA9001DE90F /* Makefile.am in Resources */,
+ 83E49A4F0DE4CCA9001DE90F /* Makefile.am in Resources */,
+ 83E49A580DE4CCA9001DE90F /* Makefile.am in Resources */,
+ 83E49A6E0DE4CCA9001DE90F /* Makefile.am in Resources */,
+ 83E49A880DE6B6AA001DE90F /* RecordMedia.nib in Resources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+ 83E499C40DE4CA1B001DE90F /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 83E49A3F0DE4CCA9001DE90F /* console.m in Sources */,
+ 83E49A400DE4CCA9001DE90F /* drivesettingswindowcontroller.m in Sources */,
+ 83E49A410DE4CCA9001DE90F /* iecdrivesettingswindowcontroller.m in Sources */,
+ 83E49A420DE4CCA9001DE90F /* joysticksettingswindowcontroller.m in Sources */,
+ 83E49A430DE4CCA9001DE90F /* keyboardsettingswindowcontroller.m in Sources */,
+ 83E49A460DE4CCA9001DE90F /* printersettingswindowcontroller.m in Sources */,
+ 83E49A470DE4CCA9001DE90F /* resourceeditorcontroller.m in Sources */,
+ 83E49A480DE4CCA9001DE90F /* resourcetreeitem.m in Sources */,
+ 83E49A490DE4CCA9001DE90F /* soundsettingswindowcontroller.m in Sources */,
+ 83E49A4A0DE4CCA9001DE90F /* viceinformationwindowcontroller.m in Sources */,
+ 83E49A4B0DE4CCA9001DE90F /* viceresourcewindowcontroller.m in Sources */,
+ 83E49A4C0DE4CCA9001DE90F /* fullscreen.m in Sources */,
+ 83E49A4D0DE4CCA9001DE90F /* kbd.m in Sources */,
+ 83E49A4E0DE4CCA9001DE90F /* main.m in Sources */,
+ 83E49A510DE4CCA9001DE90F /* c128controller.m in Sources */,
+ 83E49A520DE4CCA9001DE90F /* c128machinecontroller.m in Sources */,
+ 83E49A530DE4CCA9001DE90F /* c128ui.m in Sources */,
+ 83E49A540DE4CCA9001DE90F /* c64controller.m in Sources */,
+ 83E49A550DE4CCA9001DE90F /* c64machinecontroller.m in Sources */,
+ 83E49A560DE4CCA9001DE90F /* c64ui.m in Sources */,
+ 83E49A570DE4CCA9001DE90F /* cbm2ui.m in Sources */,
+ 83E49A5A0DE4CCA9001DE90F /* petui.m in Sources */,
+ 83E49A5B0DE4CCA9001DE90F /* plus4ui.m in Sources */,
+ 83E49A5C0DE4CCA9001DE90F /* vic20ui.m in Sources */,
+ 83E49A5D0DE4CCA9001DE90F /* viceappcontroller.m in Sources */,
+ 83E49A5E0DE4CCA9001DE90F /* vicemachinecontroller.m in Sources */,
+ 83E49A5F0DE4CCA9001DE90F /* mousedrv.m in Sources */,
+ 83E49A600DE4CCA9001DE90F /* ui-cmdline-options.c in Sources */,
+ 83E49A610DE4CCA9001DE90F /* ui-resources.c in Sources */,
+ 83E49A620DE4CCA9001DE90F /* ui.m in Sources */,
+ 83E49A630DE4CCA9001DE90F /* uimon.m in Sources */,
+ 83E49A640DE4CCA9001DE90F /* viceapplication.m in Sources */,
+ 83E49A650DE4CCA9001DE90F /* vicemachine.m in Sources */,
+ 83E49A660DE4CCA9001DE90F /* vicemachinenotifier.m in Sources */,
+ 83E49A670DE4CCA9001DE90F /* video.m in Sources */,
+ 83E49A680DE4CCA9001DE90F /* consolewindow.m in Sources */,
+ 83E49A690DE4CCA9001DE90F /* driveview.m in Sources */,
+ 83E49A6A0DE4CCA9001DE90F /* fullscreenwindow.m in Sources */,
+ 83E49A6B0DE4CCA9001DE90F /* joystickview.m in Sources */,
+ 83E49A6C0DE4CCA9001DE90F /* keypressview.m in Sources */,
+ 83E49A6D0DE4CCA9001DE90F /* logview.m in Sources */,
+ 83E49A700DE4CCA9001DE90F /* peripheraldrawer.m in Sources */,
+ 83E49A710DE4CCA9001DE90F /* tapeview.m in Sources */,
+ 83E49A720DE4CCA9001DE90F /* viceglview.m in Sources */,
+ 83E49A730DE4CCA9001DE90F /* vicewindow.m in Sources */,
+ 83E49A740DE4CCA9001DE90F /* vsidui.m in Sources */,
+ 83E49A830DE6B688001DE90F /* recordmediawindowcontroller.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+ 83E499790DE4C8C8001DE90F /* DriveSettings.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 83E4997A0DE4C8C8001DE90F /* English */,
+ );
+ name = DriveSettings.nib;
+ sourceTree = "<group>";
+ };
+ 83E4997B0DE4C8C8001DE90F /* IECDriveSettings.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 83E4997C0DE4C8C8001DE90F /* English */,
+ );
+ name = IECDriveSettings.nib;
+ sourceTree = "<group>";
+ };
+ 83E4997D0DE4C8C8001DE90F /* JoystickSettings.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 83E4997E0DE4C8C8001DE90F /* English */,
+ );
+ name = JoystickSettings.nib;
+ sourceTree = "<group>";
+ };
+ 83E4997F0DE4C8C8001DE90F /* KeyboardSettings.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 83E499800DE4C8C8001DE90F /* English */,
+ );
+ name = KeyboardSettings.nib;
+ sourceTree = "<group>";
+ };
+ 83E499850DE4C8C8001DE90F /* PrinterSettings.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 83E499860DE4C8C8001DE90F /* English */,
+ );
+ name = PrinterSettings.nib;
+ sourceTree = "<group>";
+ };
+ 83E499890DE4C8C8001DE90F /* ResourceEditor.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 83E4998A0DE4C8C8001DE90F /* English */,
+ );
+ name = ResourceEditor.nib;
+ sourceTree = "<group>";
+ };
+ 83E4998D0DE4C8C8001DE90F /* SoundSettings.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 83E4998E0DE4C8C8001DE90F /* English */,
+ );
+ name = SoundSettings.nib;
+ sourceTree = "<group>";
+ };
+ 83E4998F0DE4C8C8001DE90F /* VICEInformation.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 83E499900DE4C8C8001DE90F /* English */,
+ );
+ name = VICEInformation.nib;
+ sourceTree = "<group>";
+ };
+ 83E499910DE4C8C8001DE90F /* x64.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 83E499920DE4C8C8001DE90F /* English */,
+ );
+ name = x64.nib;
+ sourceTree = "<group>";
+ };
+ 83E49A860DE6B6AA001DE90F /* RecordMedia.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 83E49A870DE6B6AA001DE90F /* English */,
+ );
+ name = RecordMedia.nib;
+ sourceTree = "<group>";
+ };
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+ 83E4995F0DE4C808001DE90F /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk;
+ };
+ name = Debug;
+ };
+ 83E499600DE4C808001DE90F /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk;
+ };
+ name = Release;
+ };
+ 83E499CA0DE4CA1C001DE90F /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_MODEL_TUNING = G5;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+ INFOPLIST_FILE = "VICE-Info.plist";
+ INSTALL_PATH = "$(HOME)/Applications";
+ OTHER_LDFLAGS = (
+ "-framework",
+ Foundation,
+ "-framework",
+ AppKit,
+ );
+ PREBINDING = NO;
+ PRODUCT_NAME = VICE;
+ WRAPPER_EXTENSION = app;
+ ZERO_LINK = YES;
+ };
+ name = Debug;
+ };
+ 83E499CB0DE4CA1C001DE90F /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_MODEL_TUNING = G5;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+ INFOPLIST_FILE = "VICE-Info.plist";
+ INSTALL_PATH = "$(HOME)/Applications";
+ OTHER_LDFLAGS = (
+ "-framework",
+ Foundation,
+ "-framework",
+ AppKit,
+ );
+ PREBINDING = NO;
+ PRODUCT_NAME = VICE;
+ WRAPPER_EXTENSION = app;
+ ZERO_LINK = NO;
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ 83E499610DE4C808001DE90F /* Build configuration list for PBXProject "VICE" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 83E4995F0DE4C808001DE90F /* Debug */,
+ 83E499600DE4C808001DE90F /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ 83E499CC0DE4CA1C001DE90F /* Build configuration list for PBXNativeTarget "VICE" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 83E499CA0DE4CA1C001DE90F /* Debug */,
+ 83E499CB0DE4CA1C001DE90F /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = 83E4995E0DE4C808001DE90F /* Project object */;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cnv...@us...> - 2008-05-23 19:46:06
|
Revision: 18800
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18800&view=rev
Author: cnvogelg
Date: 2008-05-23 12:46:11 -0700 (Fri, 23 May 2008)
Log Message:
-----------
* configure.in: use given OBJCFLAGS if available
* src/arch/unix/archdep.*: made archdep_pref_path const
* added src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib
* src/arch/unix/macosx/Resources/English.lproj/x64.nib: adjusted menu for record media entry
* lots of deprecated NSString usage fixes in cocoa part
* introduced canvasId and canvas registry to manage canvas on app and machine side
* added "Record Media..." menu and dialog to support media recording interface with FFMPEG options
Modified Paths:
--------------
branches/chris/cocoa-port/vice/configure.in
branches/chris/cocoa-port/vice/src/arch/unix/archdep.c
branches/chris/cocoa-port/vice/src/arch/unix/archdep.h
branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/classes.nib
branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/info.nib
branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/keyedobjects.nib
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/console.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.am
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/fullscreen.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/kbd.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/main.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/c64machinecontroller.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.h
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.h
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/uimon.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/viceapplication.h
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/viceapplication.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/vicemachine.h
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/vicemachine.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/video.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/videoarch.h
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/consolewindow.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/joystickview.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/keypressview.m
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/viceglview.h
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/viceglview.m
Added Paths:
-----------
branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/
branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib
branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib
branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/keyedobjects.nib
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.h
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.m
Modified: branches/chris/cocoa-port/vice/configure.in
===================================================================
--- branches/chris/cocoa-port/vice/configure.in 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/configure.in 2008-05-23 19:46:11 UTC (rev 18800)
@@ -102,7 +102,9 @@
dnl --- setup Objective-C ---
OBJC="${CC}"
-OBJCFLAGS="${CFLAGS}"
+if [ "x${OBJCFLAGS}" = x ]; then
+ OBJCFLAGS="${CFLAGS}"
+fi
OBJCDEPMODE="depmode=${CC}"
AC_SUBST(OBJC)
AC_SUBST(OBJCFLAGS)
Modified: branches/chris/cocoa-port/vice/src/arch/unix/archdep.c
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/archdep.c 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/archdep.c 2008-05-23 19:46:11 UTC (rev 18800)
@@ -61,7 +61,7 @@
static char *boot_path = NULL;
/* alternate storage of preferences */
-char *archdep_pref_path = NULL; /* NULL -> use home_path + ".vice" */
+const char *archdep_pref_path = NULL; /* NULL -> use home_path + ".vice" */
int archdep_init(int *argc, char **argv)
{
Modified: branches/chris/cocoa-port/vice/src/arch/unix/archdep.h
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/archdep.h 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/archdep.h 2008-05-23 19:46:11 UTC (rev 18800)
@@ -106,7 +106,7 @@
extern const char *archdep_home_path(void);
/* set this path to customize the preference storage */
-extern char *archdep_pref_path;
+extern const char *archdep_pref_path;
/* Define the default system directory (where the ROMs are). */
#ifdef __NetBSD__
Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib (rev 0)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/classes.nib 2008-05-23 19:46:11 UTC (rev 18800)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "" rel="nofollow">http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>triggerResourceUpdate</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>VICEResourceWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSWindowController</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>changedAudioBitrate</key>
+ <string>id</string>
+ <key>changedAudioFormat</key>
+ <string>id</string>
+ <key>changedMediaFileName</key>
+ <string>id</string>
+ <key>changedMediaFormat</key>
+ <string>id</string>
+ <key>changedMediaType</key>
+ <string>id</string>
+ <key>changedVideoBitrate</key>
+ <string>id</string>
+ <key>changedVideoFormat</key>
+ <string>id</string>
+ <key>pickMediaFileName</key>
+ <string>id</string>
+ <key>startRecording</key>
+ <string>id</string>
+ <key>stopRecording</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>RecordMediaWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>audioBitrate</key>
+ <string>NSTextField</string>
+ <key>audioFormat</key>
+ <string>NSPopUpButton</string>
+ <key>mediaFileName</key>
+ <string>NSTextField</string>
+ <key>mediaFileNamePicker</key>
+ <string>NSButton</string>
+ <key>mediaFormat</key>
+ <string>NSPopUpButton</string>
+ <key>mediaType</key>
+ <string>NSPopUpButton</string>
+ <key>startRecord</key>
+ <string>NSButton</string>
+ <key>stopRecord</key>
+ <string>NSButton</string>
+ <key>videoBitrate</key>
+ <string>NSTextField</string>
+ <key>videoFormat</key>
+ <string>NSPopUpButton</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>VICEResourceWindowController</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib (rev 0)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/info.nib 2008-05-23 19:46:11 UTC (rev 18800)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "" rel="nofollow">http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBFramework Version</key>
+ <string>629</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../../../VICE.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>3</integer>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>25</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>9C7010</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
+</dict>
+</plist>
Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Property changes on: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/RecordMedia.nib/keyedobjects.nib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/classes.nib
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/classes.nib 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/classes.nib 2008-05-23 19:46:11 UTC (rev 18800)
@@ -84,8 +84,14 @@
<string>id</string>
<key>showKeyboardSettings</key>
<string>id</string>
+ <key>showNetplay</key>
+ <string>id</string>
<key>showPrinterSettings</key>
<string>id</string>
+ <key>showRecordMedia</key>
+ <string>id</string>
+ <key>showRecordSnapshot</key>
+ <string>id</string>
<key>showResourceEditor</key>
<string>id</string>
<key>showSoundSettings</key>
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/info.nib
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/info.nib 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/info.nib 2008-05-23 19:46:11 UTC (rev 18800)
@@ -4,11 +4,13 @@
<dict>
<key>IBFramework Version</key>
<string>629</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../../../VICE.xcodeproj</string>
<key>IBOldestOS</key>
<integer>3</integer>
<key>IBOpenObjects</key>
<array>
- <integer>405</integer>
+ <integer>355</integer>
</array>
<key>IBSystem Version</key>
<string>9C7010</string>
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/x64.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/console.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/console.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/console.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -75,7 +75,7 @@
va_end(ap);
if(log && (log->private!=nil))
- [(ConsoleWindow*)log->private appendText:[NSString stringWithCString:tmp]];
+ [(ConsoleWindow*)log->private appendText:[NSString stringWithCString:tmp encoding:NSUTF8StringEncoding]];
lib_free(tmp);
return 0;
@@ -85,8 +85,8 @@
{
if(log && (log->private!=nil)) {
NSString * s = [(ConsoleWindow*)log->private
- readline:[NSString stringWithCString:prompt]];
- return s ? lib_stralloc([s cString]) : NULL;
+ readline:[NSString stringWithCString:prompt encoding:NSUTF8StringEncoding]];
+ return s ? lib_stralloc([s cStringUsingEncoding:NSUTF8StringEncoding]) : NULL;
} else
return NULL;
}
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.am
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.am 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/Makefile.am 2008-05-23 19:46:11 UTC (rev 18800)
@@ -27,7 +27,8 @@
viceresourcewindowcontroller.h \
viceinformationwindowcontroller.h \
resourceeditorcontroller.h \
- resourcetreeitem.h
+ resourcetreeitem.h \
+ recordmediawindowcontroller.h
libarchmacosxcocoadialog_a_SOURCES = \
drivesettingswindowcontroller.m \
@@ -39,4 +40,5 @@
viceresourcewindowcontroller.m \
viceinformationwindowcontroller.m \
resourceeditorcontroller.m \
- resourcetreeitem.m
+ resourcetreeitem.m \
+ recordmediawindowcontroller.m
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/drivesettingswindowcontroller.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -185,11 +185,11 @@
int driveNum = [driveChooser selectedSegment] + driveOffset;
id cell = [sender selectedCell];
int driveId = [cell tag];
- int driveType = [self mapToDriveType:driveId];
+ int driveTypeVar = [self mapToDriveType:driveId];
[self setIntResource:@"Drive%dType"
withNumber:driveNum
- toValue:driveType];
+ toValue:driveTypeVar];
[self updateResources:nil];
}
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/keyboardsettingswindowcontroller.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -61,7 +61,7 @@
// ----- Actions -----
-const NSString *tags[3] = { @"KeymapSymFile",@"KeymapSymDeFile",@"KeymapPosFile" };
+NSString *tags[3] = { @"KeymapSymFile",@"KeymapSymDeFile",@"KeymapPosFile" };
-(IBAction)selectKeymap:(id)sender
{
@@ -72,7 +72,6 @@
-(IBAction)changedKeymapFile:(id)sender
{
int index = [sender tag];
- NSString *resource;
[self setStringResource:tags[index] toValue:[sender stringValue]];
}
Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.h
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.h (rev 0)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.h 2008-05-23 19:46:11 UTC (rev 18800)
@@ -0,0 +1,74 @@
+/*
+ * recordmediawindowcontroller.h - record media
+ *
+ * Written by
+ * Christian Vogelgsang <ch...@vo...>
+ *
+ * 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.
+ *
+ */
+
+#import <Cocoa/Cocoa.h>
+#import "viceresourcewindowcontroller.h"
+
+@interface RecordMediaWindowController : VICEResourceWindowController
+{
+ IBOutlet NSButton *startRecord;
+ IBOutlet NSButton *stopRecord;
+
+ IBOutlet NSTextField *mediaFileName;
+ IBOutlet NSButton *mediaFileNamePicker;
+ IBOutlet NSPopUpButton *mediaType;
+
+ IBOutlet NSPopUpButton *mediaFormat;
+ IBOutlet NSPopUpButton *audioFormat;
+ IBOutlet NSTextField *audioBitrate;
+ IBOutlet NSPopUpButton *videoFormat;
+ IBOutlet NSTextField *videoBitrate;
+
+ NSArray *currentMediaFormats;
+
+ NSString *currentMediaType;
+ BOOL currentMediaTypeHasOptions;
+ NSString *currentMediaFormat;
+ NSDictionary *currentVideoFormats;
+ NSDictionary *currentAudioFormats;
+
+ NSString *currentDefaultExtension;
+}
+
+-(void)updateResources:(NSNotification *)notification;
+
+-(IBAction)startRecording:(id)sender;
+-(IBAction)stopRecording:(id)sender;
+
+-(IBAction)changedMediaFileName:(id)sender;
+-(IBAction)pickMediaFileName:(id)sender;
+-(IBAction)changedMediaType:(id)sender;
+
+-(IBAction)changedMediaFormat:(id)sender;
+-(IBAction)changedAudioFormat:(id)sender;
+-(IBAction)changedAudioBitrate:(id)sender;
+-(IBAction)changedVideoFormat:(id)sender;
+-(IBAction)changedVideoBitrate:(id)sender;
+
+-(void)setupMediaType;
+-(void)updateMediaType;
+
+@end
Added: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.m (rev 0)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/recordmediawindowcontroller.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -0,0 +1,328 @@
+/*
+ * recordmediawindowcontroller.m - record media
+ *
+ * Written by
+ * Christian Vogelgsang <ch...@vo...>
+ *
+ * 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.
+ *
+ */
+
+#import "recordmediawindowcontroller.h"
+#import "viceapplication.h"
+#import "vicenotifications.h"
+
+@implementation RecordMediaWindowController
+
+-(id)init
+{
+ self = [super initWithWindowNibName:@"RecordMedia"];
+ [self registerForResourceUpdate:@selector(updateResources:)];
+ return self;
+}
+
+-(void)dealloc
+{
+ [currentMediaType release];
+ [currentMediaFormats release];
+ [super dealloc];
+}
+
+-(void)windowDidLoad
+{
+ [mediaFileName setStringValue:@"capture"];
+ [stopRecord setEnabled:FALSE];
+
+ [self setupMediaType];
+ [self updateMediaType];
+ [self updateResources:nil];
+
+ [super windowDidLoad];
+}
+
+-(void)updateAudioBitrate
+{
+ NSString *res = [NSString stringWithFormat:@"%@AudioBitrate",currentMediaType];
+ int value = [self getIntResource:res];
+ [audioBitrate setIntValue:value];
+}
+
+-(void)updateVideoBitrate
+{
+ NSString *res = [NSString stringWithFormat:@"%@VideoBitrate",currentMediaType];
+ int value = [self getIntResource:res];
+ [videoBitrate setIntValue:value];
+}
+
+-(void)updateVideoFormat
+{
+ // get current video format
+ NSString *res = [NSString stringWithFormat:@"%@VideoCodec",currentMediaType];
+ int codecId = [self getIntResource:res];
+ NSString *codecName = (NSString *)[currentVideoFormats objectForKey:[NSNumber numberWithInt:codecId]];
+ if(codecName!=nil) {
+ [videoFormat selectItemWithTitle:codecName];
+ }
+}
+
+-(void)updateAudioFormat
+{
+ // get current video format
+ NSString *res = [NSString stringWithFormat:@"%@AudioCodec",currentMediaType];
+ int codecId = [self getIntResource:res];
+ NSString *codecName = (NSString *)[currentAudioFormats objectForKey:[NSNumber numberWithInt:codecId]];
+ if(codecName!=nil) {
+ [audioFormat selectItemWithTitle:codecName];
+ }
+}
+
+-(void)replaceFileNameExtension:(BOOL)force
+{
+ NSString *fileName = [mediaFileName stringValue];
+
+ // if not forced only replace if there is no extension
+ BOOL doit = force;
+ if(!doit) {
+ doit = [[fileName pathExtension] length] == 0;
+ }
+
+ if(doit) {
+ fileName = [fileName stringByDeletingPathExtension];
+ NSString *result = [NSString stringWithFormat:@"%@.%@",fileName,currentDefaultExtension];
+ [mediaFileName setStringValue:result];
+ }
+}
+
+-(void)fetchDefaultExtension
+{
+ [currentDefaultExtension release];
+ currentDefaultExtension = [[VICEApplication theMachineController]
+ defaultExtensionForMediaDriver:currentMediaType
+ andFormat:currentMediaFormat];
+ [currentDefaultExtension retain];
+
+ [self replaceFileNameExtension:TRUE];
+}
+
+-(void)updateMediaFormat
+{
+ if(!currentMediaTypeHasOptions)
+ return;
+
+ // get current format
+ NSString *res = [NSString stringWithFormat:@"%@Format",currentMediaType];
+ [currentMediaFormat release];
+ currentMediaFormat = [self getStringResource:res];
+ [currentMediaFormat retain];
+
+ [self fetchDefaultExtension];
+
+ // set media format
+ [mediaFormat selectItemWithTitle:currentMediaFormat];
+
+ // find media format in description and setup audio and video codecs
+ int i;
+ for(i=0;i<[currentMediaFormats count];i++) {
+ NSArray *fa = (NSArray *)[currentMediaFormats objectAtIndex:i];
+ NSString *formatName = (NSString *)[fa objectAtIndex:0];
+
+ // set audio and video codecs for current format
+ if([currentMediaFormat compare:formatName]==NSOrderedSame) {
+ currentVideoFormats = (NSDictionary *)[fa objectAtIndex:1];
+ currentAudioFormats = (NSDictionary *)[fa objectAtIndex:2];
+
+ [videoFormat removeAllItems];
+ [videoFormat addItemsWithTitles:[currentVideoFormats allValues]];
+
+ [audioFormat removeAllItems];
+ [audioFormat addItemsWithTitles:[currentAudioFormats allValues]];
+
+ BOOL hasVideoFormats = [currentVideoFormats count] > 0;
+ BOOL hasAudioFormats = [currentAudioFormats count] > 0;
+
+ [videoFormat setEnabled:hasVideoFormats];
+ [videoBitrate setEnabled:hasVideoFormats];
+ [audioFormat setEnabled:hasAudioFormats];
+ [audioBitrate setEnabled:hasAudioFormats];
+
+ break;
+ }
+ }
+
+ // set the correct format
+ [self updateAudioFormat];
+ [self updateVideoFormat];
+ [self updateAudioBitrate];
+ [self updateVideoBitrate];
+}
+
+-(void)updateMediaType
+{
+ // fetch media type from pop up button
+ [currentMediaType release];
+ currentMediaType = [[mediaType selectedItem] title];
+ [currentMediaType retain];
+
+ // ask the machine controller if the media type has options
+ currentMediaTypeHasOptions = [[VICEApplication theMachineController] mediaDriverHasOptions:currentMediaType];
+ BOOL hasOptions = currentMediaTypeHasOptions;
+
+ // enable/disable options
+ [mediaFormat setEnabled:hasOptions];
+ [videoFormat setEnabled:hasOptions];
+ [videoBitrate setEnabled:hasOptions];
+ [audioFormat setEnabled:hasOptions];
+ [audioBitrate setEnabled:hasOptions];
+
+ if(hasOptions) {
+ // fetch all formats and video/audio codecs from machine controller
+ [currentMediaFormats release];
+ currentMediaFormats = [[VICEApplication theMachineController] enumMediaFormats:currentMediaType];
+ [currentMediaFormats retain];
+
+ // fill in formats
+ [mediaFormat removeAllItems];
+ int i;
+ for(i=0;i<[currentMediaFormats count];i++) {
+ NSArray *fa = (NSArray *)[currentMediaFormats objectAtIndex:i];
+ NSString *formatName = (NSString *)[fa objectAtIndex:0];
+ [mediaFormat addItemWithTitle:formatName];
+ }
+
+ // set current format and setup audio video codecs
+ [self updateMediaFormat];
+ } else {
+ [currentMediaFormat release];
+ currentMediaFormat = nil;
+ [self fetchDefaultExtension];
+ }
+}
+
+-(void)setupMediaType
+{
+ [mediaType removeAllItems];
+ [mediaType addItemsWithTitles:[[VICEApplication theMachineController] enumMediaDrivers]];
+}
+
+-(void)updateResources:(NSNotification *)notification
+{
+ [self updateMediaFormat];
+}
+
+// ----- Actions -----
+
+-(IBAction)startRecording:(id)sender
+{
+ int canvasId = [VICEApplication currentCanvasId];
+ NSString *fileName = [mediaFileName stringValue];
+ NSString *driver = [[mediaType selectedItem] title];
+
+ BOOL ok = [[VICEApplication theMachineController] startRecordingMedia:driver
+ fromCanvas:canvasId
+ toFile:fileName];
+ if(!ok) {
+ [VICEApplication runErrorMessage:@"Can't start media recording!"];
+ } else {
+ // still recording? enable stop button
+ if([[VICEApplication theMachineController] isRecordingMedia]) {
+ [stopRecord setEnabled:TRUE];
+ [startRecord setEnabled:FALSE];
+ [mediaFileName setEnabled:FALSE];
+ [mediaFileNamePicker setEnabled:FALSE];
+ }
+ }
+}
+
+-(IBAction)stopRecording:(id)sender
+{
+ [[VICEApplication theMachineController] stopRecordingMedia];
+
+ [stopRecord setEnabled:FALSE];
+ [startRecord setEnabled:TRUE];
+ [mediaFileName setEnabled:TRUE];
+ [mediaFileNamePicker setEnabled:TRUE];
+}
+
+-(IBAction)changedMediaFileName:(id)sender
+{
+ [self replaceFileNameExtension:FALSE];
+}
+
+-(IBAction)pickMediaFileName:(id)sender
+{
+ NSString *title = [NSString stringWithFormat:@"Record %@ Media",currentDefaultExtension];
+ NSString *fileName = [self pickSaveFileWithTitle:title types:[NSArray arrayWithObjects:currentDefaultExtension,nil]];
+ if(fileName!=nil) {
+ [mediaFileName setStringValue:fileName];
+ }
+}
+
+-(IBAction)changedMediaType:(id)sender
+{
+ [self updateMediaType];
+}
+
+-(IBAction)changedMediaFormat:(id)sender
+{
+ NSString *res = [NSString stringWithFormat:@"%@Format",currentMediaType];
+ [self setStringResource:res toValue:[mediaFormat titleOfSelectedItem]];
+ [self updateMediaFormat];
+}
+
+-(IBAction)changedAudioFormat:(id)sender
+{
+ NSString *curFormat = [audioFormat titleOfSelectedItem];
+ NSArray *keys = [currentAudioFormats allKeysForObject:curFormat];
+ if([keys count]==1) {
+ NSString *res = [NSString stringWithFormat:@"%@AudioCodec",currentMediaType];
+ int value = [(NSNumber *)[keys objectAtIndex:0] intValue];
+ [self setIntResource:res toValue:value];
+ [self updateAudioFormat];
+ }
+}
+
+-(IBAction)changedAudioBitrate:(id)sender
+{
+ NSString *res = [NSString stringWithFormat:@"%@AudioBitrate",currentMediaType];
+ int value = [audioBitrate intValue];
+ [self setIntResource:res toValue:value];
+ [self updateAudioBitrate];
+}
+
+-(IBAction)changedVideoFormat:(id)sender
+{
+ NSString *curFormat = [videoFormat titleOfSelectedItem];
+ NSArray *keys = [currentVideoFormats allKeysForObject:curFormat];
+ if([keys count]==1) {
+ NSString *res = [NSString stringWithFormat:@"%@VideoCodec",currentMediaType];
+ int value = [(NSNumber *)[keys objectAtIndex:0] intValue];
+ [self setIntResource:res toValue:value];
+ [self updateVideoFormat];
+ }
+}
+
+-(IBAction)changedVideoBitrate:(id)sender
+{
+ NSString *res = [NSString stringWithFormat:@"%@VideoBitrate",currentMediaType];
+ int value = [videoBitrate intValue];
+ [self setIntResource:res toValue:value];
+ [self updateVideoBitrate];
+}
+
+@end
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/dialog/resourcetreeitem.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -305,7 +305,6 @@
-(void)setValueExtra:(id)ctl
{
ResourceEditorController *controller = (ResourceEditorController *)ctl;
- BOOL needReload = FALSE;
switch(hint) {
case ResourceTreeItemHintFileOpen:
{
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/fullscreen.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/fullscreen.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/fullscreen.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -27,11 +27,6 @@
#include "vice.h"
#include "video.h"
-static int fullscreen_enable(struct video_canvas_s* canvas, int enable)
-{
- return 0;
-}
-
void fullscreen_capability(cap_fullscreen_t *cap_fullscreen)
{
// fullscreen is handled in VICEWindow itself
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/kbd.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/kbd.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/kbd.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -26,6 +26,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include "vice.h"
#include "kbd.h"
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/main.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/main.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/main.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -48,7 +48,7 @@
NSString *basePath = @"~/Library/Preferences/";
NSString *prefPath = [basePath stringByAppendingString:bundleId];
prefPath = [prefPath stringByExpandingTildeInPath];
- archdep_pref_path = [prefPath cString];
+ archdep_pref_path = [prefPath cStringUsingEncoding:NSUTF8StringEncoding];
// fetch instance
[VICEApplication sharedApplication];
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/c64machinecontroller.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/c64machinecontroller.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/c64machinecontroller.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -33,7 +33,7 @@
- (BOOL)attachCartridge:(int)type image:(NSString *)imageFile
{
- return cartridge_attach_image(type,[imageFile cString]) == 0;
+ return cartridge_attach_image(type,[imageFile cStringUsingEncoding:NSUTF8StringEncoding]) == 0;
}
- (BOOL)attachExpertCartridge
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.h
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.h 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.h 2008-05-23 19:46:11 UTC (rev 18800)
@@ -33,6 +33,7 @@
#import "soundsettingswindowcontroller.h"
#import "viceinformationwindowcontroller.h"
#import "resourceeditorcontroller.h"
+#import "recordmediawindowcontroller.h"
@interface VICEAppController : NSObject
{
@@ -45,6 +46,7 @@
SoundSettingsWindowController *soundSettingsController;
VICEInformationWindowController *infoController;
ResourceEditorController *resourceEditorController;
+ RecordMediaWindowController *recordMediaController;
// Options Outlets
IBOutlet NSMenu *refreshRateMenu;
@@ -92,6 +94,11 @@
- (IBAction)loadQuickSnapshot:(id)sender;
- (IBAction)saveQuickSnapshot:(id)sender;
+- (IBAction)showRecordSnapshot:(id)sender;
+- (IBAction)showRecordMedia:(id)sender;
+
+- (IBAction)showNetplay:(id)sender;
+
// Options
- (IBAction)pickRefreshRate:(id)sender;
- (IBAction)pickMaximumSpeed:(id)sender;
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/viceappcontroller.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -271,7 +271,7 @@
BOOL saveDisks = ([saveDisksCheck state] == NSOnState);
NSString * path = [panel filename];
if(path!=nil) {
- [[VICEApplication theMachineController] saveSnapshot:path withROMS:FALSE andDisks:FALSE];
+ [[VICEApplication theMachineController] saveSnapshot:path withROMS:saveRoms andDisks:saveDisks];
}
}
[pool release];
@@ -287,6 +287,22 @@
[[VICEApplication theMachineController] saveQuickSnapshot];
}
+- (IBAction)showRecordSnapshot:(id)sender
+{
+}
+
+- (IBAction)showRecordMedia:(id)sender
+{
+ if(!recordMediaController) {
+ recordMediaController = [[RecordMediaWindowController alloc] init];
+ }
+ [recordMediaController showWindow:self];
+}
+
+- (IBAction)showNetplay:(id)sender
+{
+}
+
// ----- Options -----
- (IBAction)pickRefreshRate:(id)sender
@@ -570,6 +586,7 @@
{
[[VICEApplication theMachineController]
setIntResource:name value:[NSNumber numberWithInt:value]];
+ return TRUE;
}
- (int)getIntResource:(NSString *)name
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.h
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.h 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.h 2008-05-23 19:46:11 UTC (rev 18800)
@@ -73,13 +73,23 @@
// save a quick snapshot to a file
-(void)saveQuickSnapshot;
-// ----- Screenshot -----
-// save s screen shot
--(BOOL)saveScreenshot:(NSString *)path withDriver:(NSString *)driver;
+// ----- Media -----
+// start recording media/save screen shot
+-(BOOL)startRecordingMedia:(NSString *)driver
+ fromCanvas:(int)canvasId
+ toFile:(NSString *)path;
// is recording a screenshot
--(BOOL)isRecordingScreenshot;
+-(BOOL)isRecordingMedia;
// stop recording screenshot
--(BOOL)stopRecordingScreenshot;
+-(void)stopRecordingMedia;
+// enumerate media
+-(NSArray *)enumMediaDrivers;
+// has driver container
+-(BOOL)mediaDriverHasOptions:(NSString *)driver;
+// enumerate media formats
+-(NSArray *)enumMediaFormats:(NSString *)driver;
+// extension for media
+-(NSString *)defaultExtensionForMediaDriver:(NSString *)driver andFormat:(NSString *)format;
// ----- Keyboard -----
// key pressed
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/menu/vicemachinecontroller.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -37,6 +37,14 @@
#include "printer.h"
#include "archdep.h"
#include "log.h"
+#include "screenshot.h"
+#include "gfxoutput.h"
+#include "videoarch.h"
+#include "interrupt.h"
+#include "tape.h"
+#include "mouse.h"
+#include "vdrive-internal.h"
+#include "gfxoutputdrv/ffmpegdrv.h"
#import "vicemachinecontroller.h"
#import "vicemachine.h"
@@ -265,7 +273,101 @@
[self loadSnapshot:path];
}
}
-
+
+// ----- Media -----
+
+-(BOOL)startRecordingMedia:(NSString *)driver fromCanvas:(int)canvasId
+ toFile:(NSString *)path
+{
+ // fetch real canvas for id
+ video_canvas_t *canvas = [theVICEMachine getCanvasForId:canvasId];
+ if(canvas==NULL)
+ return false;
+
+ int result = screenshot_save([driver cStringUsingEncoding:NSUTF8StringEncoding],
+ [path cStringUsingEncoding:NSUTF8StringEncoding],
+ canvas);
+ return result == 0;
+}
+
+-(BOOL)isRecordingMedia
+{
+ return screenshot_is_recording();
+}
+
+-(void)stopRecordingMedia
+{
+ screenshot_stop_recording();
+}
+
+-(NSArray *)enumMediaDrivers
+{
+ int i;
+ gfxoutputdrv_t *driver;
+
+ NSMutableArray *a = [[NSMutableArray alloc] init];
+ driver = gfxoutput_drivers_iter_init();
+ for (i = 0; i < gfxoutput_num_drivers(); i++) {
+ NSString *name = [NSString stringWithCString:driver->name encoding:NSUTF8StringEncoding];
+ [a addObject:name];
+ driver = gfxoutput_drivers_iter_next();
+ }
+ return [a autorelease];
+}
+
+-(BOOL)mediaDriverHasOptions:(NSString *)driver
+{
+ if([driver compare:@"FFMPEG"]==NSOrderedSame)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+-(NSArray *)enumMediaFormats:(NSString *)driver
+{
+ // currently only FFMPEG here
+ int i;
+ NSMutableArray *a = [[NSMutableArray alloc] init];
+ for (i=0;ffmpegdrv_formatlist[i].name!=NULL;i++) {
+ NSString *fname = [NSString stringWithCString:ffmpegdrv_formatlist[i].name encoding:NSUTF8StringEncoding];
+
+ // fetch video codecs
+ int j;
+ ffmpegdrv_codec_t *video_codecs = ffmpegdrv_formatlist[i].video_codecs;
+ NSMutableDictionary *video = [[NSMutableDictionary alloc] init];
+ if(video_codecs!=NULL) {
+ for(j=0;video_codecs->name!=NULL;j++) {
+ NSString *vname = [NSString stringWithCString:video_codecs->name encoding:NSUTF8StringEncoding];
+ [video setObject:vname forKey:[NSNumber numberWithInt:video_codecs->id]];
+ video_codecs++;
+ }
+ }
+
+ // fetch audio codecs
+ ffmpegdrv_codec_t *audio_codecs = ffmpegdrv_formatlist[i].audio_codecs;
+ NSMutableDictionary *audio = [[NSMutableDictionary alloc] init];
+ if(audio_codecs!=NULL) {
+ for(j=0;audio_codecs->name!=NULL;j++) {
+ NSString *aname = [NSString stringWithCString:audio_codecs->name encoding:NSUTF8StringEncoding];
+ [audio setObject:aname forKey:[NSNumber numberWithInt:audio_codecs->id]];
+ audio_codecs++;
+ }
+ }
+
+ [a addObject:[NSArray arrayWithObjects:fname,video,audio,nil]];
+ }
+ return [a autorelease];
+}
+
+-(NSString *)defaultExtensionForMediaDriver:(NSString *)driver andFormat:(NSString *)format
+{
+ if(format==nil) {
+ return [driver lowercaseString];
+ } else {
+ return format;
+ }
+}
+
// ----- Keyboard -----
-(void)keyPressed:(unsigned int)code
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/uimon.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/uimon.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/uimon.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -57,18 +57,18 @@
int uimon_out(const char *buffer)
{
- [[theVICEMachine app] printMonitorMessage:[NSString stringWithCString:buffer]];
+ [[theVICEMachine app] printMonitorMessage:[NSString stringWithCString:buffer encoding:NSUTF8StringEncoding]];
return 0;
}
char *uimon_get_in(char **ppchCommandLine, const char *prompt)
{
- NSString *line = [[theVICEMachine app] readMonitorLine:[NSString stringWithCString:prompt]];
+ NSString *line = [[theVICEMachine app] readMonitorLine:[NSString stringWithCString:prompt encoding:NSUTF8StringEncoding]];
char *ret;
if(line==nil)
ret = lib_stralloc("exit");
else
- ret = lib_stralloc([line cString]);
+ ret = lib_stralloc([line cStringUsingEncoding:NSUTF8StringEncoding]);
return ret;
}
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/viceapplication.h
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/viceapplication.h 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/viceapplication.h 2008-05-23 19:46:11 UTC (rev 18800)
@@ -41,6 +41,7 @@
ConsoleWindow *consoleWindow;
int canvasCount;
+ int currentCanvasId;
ConsoleWindow *monitorWindow;
NSWindow *oldKeyWindow;
@@ -85,5 +86,10 @@
// get the app controller
+ (VICEAppController *)theAppController;
+// report current canvas id from VICEGLView
++ (void)setCurrentCanvasId:(int)canvasId;
+// get current canvas id
++ (int)currentCanvasId;
+
@end
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/viceapplication.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/viceapplication.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/viceapplication.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -220,6 +220,7 @@
// embedded gl view
VICEGLView *glView = [window getVICEGLView];
+ [glView setCanvasId:canvas->canvasId];
// fill canvas structure
canvas->window = window;
@@ -263,6 +264,28 @@
[[canvas->window getVICEGLView] updateTexture];
}
+- (void)setCurrentCanvasId:(int)c
+{
+ currentCanvasId = c;
+}
+
+- (int)currentCanvasId
+{
+ return currentCanvasId;
+}
+
++ (void)setCurrentCanvasId:(int)canvasId
+{
+ VICEApplication *app = (VICEApplication *)[self sharedApplication];
+ [app setCurrentCanvasId:canvasId];
+}
+
++ (int)currentCanvasId
+{
+ VICEApplication *app = (VICEApplication *)[self sharedApplication];
+ return [app currentCanvasId];
+}
+
// ----- Monitor -----
-(void)openMonitor
@@ -397,7 +420,7 @@
if(result==NSAlertFirstButtonReturn)
return 0;
- else if(result=NSAlertSecondButtonReturn)
+ else if(result==NSAlertSecondButtonReturn)
return 1;
else
return 2;
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/vicemachine.h
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/vicemachine.h 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/vicemachine.h 2008-05-23 19:46:11 UTC (rev 18800)
@@ -30,6 +30,8 @@
#import "vicemachinecontroller.h"
#import "vicemachinenotifier.h"
+struct video_canvas_s;
+
@interface VICEMachine : NSObject <VICEMachineProtocol>
{
id<VICEApplicationProtocol > app;
@@ -38,6 +40,10 @@
BOOL isPaused;
VICEMachineController *machineController;
VICEMachineNotifier *machineNotifier;
+
+ #define MAX_CANVAS 2
+ int canvasNum;
+ struct video_canvas_s *canvasArray[MAX_CANVAS];
}
// start the machine thread and establish connection
@@ -60,6 +66,12 @@
// access the notifier
-(VICEMachineNotifier *)machineNotifier;
+// ----- Canvas Registry -----
+// register a canvas and return id
+-(int)registerCanvas:(struct video_canvas_s *)canvas;
+// get canvas for id
+-(struct video_canvas_s *)getCanvasForId:(int)canvasId;
+
@end
// the global machine thread's machine
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/vicemachine.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/vicemachine.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/vicemachine.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -25,6 +25,8 @@
*/
#include "main.h"
+#include "vsync.h"
+#include "machine.h"
#import "vicemachine.h"
#import "vicemachinecontroller.h"
@@ -77,7 +79,7 @@
int i;
for(i=0;i<argc;i++) {
NSString *str = (NSString *)[args objectAtIndex:i];
- argv[i] = strdup([str cString]);
+ argv[i] = strdup([str cStringUsingEncoding:NSUTF8StringEncoding]);
}
// store global
@@ -158,6 +160,28 @@
}
}
+// ----- Canvas Management -----
+
+-(int)registerCanvas:(struct video_canvas_s *)canvas
+{
+ if(canvasNum==MAX_CANVAS) {
+ NSLog(@"FATAL: too many canvas registered!");
+ return -1;
+ }
+
+ int canvasId = canvasNum;
+ canvasNum++;
+ canvasArray[canvasId] = canvas;
+ return TRUE;
+}
+
+-(struct video_canvas_s *)getCanvasForId:(int)canvasId
+{
+ if((canvasId<0)||(canvasId>=canvasNum))
+ return NULL;
+ return canvasArray[canvasId];
+}
+
// ---------- ViceMachineProtocol -------------------------------------------
// ----- Machine Controller -----
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/video.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/video.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/video.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -118,6 +118,9 @@
canvas->width = width;
canvas->height = height;
+ // register canvas in machine controller (to allow access via id)
+ canvas->canvasId = [theVICEMachine registerCanvas:canvas];
+
// encapsulate canvas ptr
video_canvas_t *canvasPtr = canvas;
NSData *data = [NSData dataWithBytes:&canvasPtr length:sizeof(video_canvas_t *)];
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/videoarch.h
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/videoarch.h 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/videoarch.h 2008-05-23 19:46:11 UTC (rev 18800)
@@ -55,6 +55,7 @@
BYTE *buffer;
int pitch;
VICEWindow *window;
+ int canvasId;
struct video_draw_buffer_callback_s *video_draw_buffer_callback;
};
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/consolewindow.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/consolewindow.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/consolewindow.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -77,7 +77,6 @@
- (void)appendText:(NSString*)text
{
- BOOL doFlush = false;
if(buffer==nil)
buffer = [[NSMutableString alloc] initWithCapacity:BUFFER_SIZE];
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/joystickview.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/joystickview.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/joystickview.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -30,7 +30,7 @@
- (id)initWithFrame:(NSRect)rect
{
- if(self = [super initWithFrame:rect]) {
+ if((self = [super initWithFrame:rect])) {
stringAttr = [[NSMutableDictionary alloc] init];
[stringAttr setObject:[NSFont messageFontOfSize:0.0]
forKey:NSFontAttributeName];
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/keypressview.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/keypressview.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/keypressview.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -30,7 +30,7 @@
- (id)initWithFrame:(NSRect)rect
{
- if(self = [super initWithFrame:rect]) {
+ if((self = [super initWithFrame:rect])) {
stringAttr = [[NSMutableDictionary alloc] init];
[stringAttr setObject:[NSFont messageFontOfSize:0.0]
forKey:NSFontAttributeName];
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/viceglview.h
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/viceglview.h 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/viceglview.h 2008-05-23 19:46:11 UTC (rev 18800)
@@ -52,6 +52,8 @@
#define MOUSE_IS_SHOWN -2
NSTimer *mouseHideTimer;
int mouseHideInterval;
+
+ int canvasId;
}
- (id)initWithFrame:(NSRect)rect;
@@ -87,5 +89,8 @@
- (void)hideTimer:(NSTimer *)timer;
- (void)ensureMouseShown;
+- (void)setCanvasId:(int)canvasId;
+- (int)canvasId;
+
@end
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/viceglview.m
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/viceglview.m 2008-05-23 02:04:09 UTC (rev 18799)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/view/viceglview.m 2008-05-23 19:46:11 UTC (rev 18800)
@@ -115,7 +115,6 @@
NSRect rect = [self bounds];
NSSize size = rect.size;
- NSPoint origin;
float ratio = size.width / size.height;
viewSize = size;
@@ -362,6 +361,9 @@
{
[[self window] setAcceptsMouseMovedEvents:YES];
+ // report current canvas id to app controller
+ [VICEApplication setCurrentCanvasId:canvasId];
+
// start mouse hide timer
if(!trackMouse) {
[self startHideTimer];
@@ -450,4 +452,16 @@
}
}
+// manager canvas id
+
+- (void)setCanvasId:(int)c
+{
+ canvasId = c;
+}
+
+- (int)canvasId
+{
+ return canvasId;
+}
+
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-05-23 02:04:20
|
Revision: 18799
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18799&view=rev
Author: blackystardust
Date: 2008-05-22 19:04:09 -0700 (Thu, 22 May 2008)
Log Message:
-----------
Fixed gp2x warnings/issues
Modified Paths:
--------------
branches/marco/ports/vice/src/arch/unix/gp2x/audio_gp2x.c
branches/marco/ports/vice/src/arch/unix/gp2x/c128ui.c
branches/marco/ports/vice/src/arch/unix/gp2x/c64ui.c
branches/marco/ports/vice/src/arch/unix/gp2x/cbm2ui.c
branches/marco/ports/vice/src/arch/unix/gp2x/input_gp2x.c
branches/marco/ports/vice/src/arch/unix/gp2x/input_gp2x.h
branches/marco/ports/vice/src/arch/unix/gp2x/minimal.c
branches/marco/ports/vice/src/arch/unix/gp2x/petui.c
branches/marco/ports/vice/src/arch/unix/gp2x/plus4ui.c
branches/marco/ports/vice/src/arch/unix/gp2x/prefs_gp2x.c
branches/marco/ports/vice/src/arch/unix/gp2x/uiarch.h
branches/marco/ports/vice/src/arch/unix/gp2x/vic20ui.c
branches/marco/ports/vice/src/arch/unix/gp2x/video.c
branches/marco/ports/vice/src/arch/unix/gp2x/vkeyboard_gp2x.c
branches/marco/ports/vice/src/arch/unix/gp2x/vsidui.c
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/audio_gp2x.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/audio_gp2x.c 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/audio_gp2x.c 2008-05-23 02:04:09 UTC (rev 18799)
@@ -28,7 +28,7 @@
#include "minimal.h"
-static volume=100;
+static int volume=100;
void gp2x_sound_frame(void *blah, void *buff, int samples) {}
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/c128ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/c128ui.c 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/c128ui.c 2008-05-23 02:04:09 UTC (rev 18799)
@@ -29,8 +29,11 @@
#include <stdio.h>
#include <string.h>
+#include "cartridge.h"
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
+#include "uitext_gp2x.h"
#include "videoarch.h"
#include "vkeyboard_gp2x.h"
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/c64ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/c64ui.c 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/c64ui.c 2008-05-23 02:04:09 UTC (rev 18799)
@@ -29,8 +29,11 @@
#include <stdio.h>
#include <string.h>
+#include "cartridge.h"
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
+#include "uitext_gp2x.h"
#include "videoarch.h"
#include "vkeyboard_gp2x.h"
@@ -178,13 +181,6 @@
23, 4, 0,1, /* return */
24, 4, 0,1, /* return */
-#if 0
- 23, 5, 0|128,7, /* crsr up */
- 23, 6, 0,7, /* crsr down */
- 22, 6, 0|128,2, /* crsr left */
- 24, 6, 0,2, /* crsr right */
-#endif
-
21, 2, 0,0, /* delete */
22, 2, 0,0, /* delete */
23, 2, 0,0, /* delete */
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/cbm2ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/cbm2ui.c 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/cbm2ui.c 2008-05-23 02:04:09 UTC (rev 18799)
@@ -29,8 +29,10 @@
#include <stdio.h>
#include <string.h>
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
+#include "uitext_gp2x.h"
#include "videoarch.h"
#include "vkeyboard_gp2x.h"
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/input_gp2x.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/input_gp2x.c 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/input_gp2x.c 2008-05-23 02:04:09 UTC (rev 18799)
@@ -53,18 +53,11 @@
int input_select=0;
void gp2x_poll_input() {
- static int swap_button;
static int stats_button;
static int prefs_button;
static int vkeyb_button;
-#if 0
- static int choose_button;
-#endif
static int joy_time=0;
- static int a_held=0;
- static int b_held=0;
static int x_held=0;
- static int y_held=0;
unsigned int joy_state=gp2x_joystick_read();
@@ -72,9 +65,6 @@
if(!(joy_state&GP2X_SELECT)) prefs_button=0;
if(joy_state&GP2X_SELECT && !prefs_button) {
prefs_open=~prefs_open;
-#if 0
- ui_pause_emulation(1);
-#endif
prefs_button=1;
}
@@ -91,11 +81,8 @@
if(!rrate) rrate++;
if(joy_state&(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT)) joy_time+=rrate;
else joy_time=0;
-#if 0
- if(joy_time==rrate || !(joy_time%(4+rrate)) || joy_time>35) {
-#endif
if(joy_time==rrate || (joy_time>6)) {
- if(joy_time>4) joy_time==rrate;
+ if(joy_time>4) joy_time=rrate;
input_up=joy_state&GP2X_UP;
input_down=joy_state&GP2X_DOWN;
input_select=joy_state&GP2X_SELECT;
@@ -103,16 +90,7 @@
input_right=joy_state&GP2X_RIGHT;
}
-#if 0
/* B button */
- if(!(joy_state&(GP2X_B|GP2X_PUSH))) {
- input_b=0;
- input_b_deselected=1;
- } else if(input_b_deselected && (joy_state&(GP2X_B|GP2X_PUSH))) {
- input_b=1;
- }
-#endif
- /* B button */
if((joy_state&(GP2X_B|GP2X_PUSH))!=input_b_last) {
input_b=joy_state&(GP2X_B|GP2X_PUSH);
input_b_last=input_b;
@@ -144,41 +122,12 @@
keyboard_set_keyarr(7,4,0);
}
-#if 0
- /* a */
- if((joy_state&GP2X_A)&&!a_held) {
- a_held=1;
- keyboard_set_keyarr(1,2,1);
- } else if(a_held&&(!(joy_state&GP2X_A))) {
- a_held=0;
- keyboard_set_keyarr(1,2,0);
- }
- if((joy_state&GP2X_Y)&&!y_held) {
- y_held=1;
- keyboard_set_keyarr(1,7,1);
- } else if(y_held&&(!(joy_state&GP2X_Y))) {
- y_held=0;
- keyboard_set_keyarr(1,7,0);
- }
-#endif
-
if(gp2x_joystick_read()&GP2X_VOL_UP) volume_up();
else if(gp2x_joystick_read()&GP2X_VOL_DOWN) volume_down();
if(prefs_open||vkeyb_open) return;
-#if 0
- BYTE j=0xff;
- unsigned int joy_state=gp2x_joystick_read();
- if(joy_state&GP2X_UP) j&=0xfe;
- else if(joy_state&GP2X_DOWN) j&=0xfd;
- if(joy_state&GP2X_LEFT) j&=0xfb;
- else if(joy_state&GP2X_RIGHT) j&=0xf7;
- if(joy_state&GP2X_B) j&=0xef; /* fire */
- joystick_value[cur_port]=~j;
-#endif
-
BYTE j=joystick_value[cur_port];
if(joy_state&GP2X_UP) j|=0x01;
else j&=~0x01;
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/input_gp2x.h
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/input_gp2x.h 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/input_gp2x.h 2008-05-23 02:04:09 UTC (rev 18799)
@@ -33,4 +33,6 @@
extern int cur_port;
+extern void gp2x_poll_input();
+
#endif
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/minimal.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/minimal.c 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/minimal.c 2008-05-23 02:04:09 UTC (rev 18799)
@@ -126,9 +126,6 @@
{
unsigned long address=gp2x_physvram[gp2x_physvram[7]];
-#if 0
- if(++gp2x_physvram[7]==4) gp2x_physvram[7]=0;
-#endif
if(gp2x_physvram[7]==0) gp2x_physvram[7]=1;
else gp2x_physvram[7]=0;
@@ -208,22 +205,6 @@
void gp2x_sound_pause(int yes) { gp2x_sound_pausei=yes; }
-static void *gp2x_sound_play(void *blah)
-{
- int flip=0, flyp=gp2x_sound_buffer[1];
- struct timespec ts; ts.tv_sec=0, ts.tv_nsec=gp2x_sound_buffer[2];
-
- while(!gp2x_sound) { nanosleep(&ts, NULL);
-
- if(!gp2x_sound_pausei) { gp2x_sound_frame(blah, (void *)(&gp2x_sound_buffer[4+flip]), gp2x_sound_buffer[0]);
- write(gp2x_dev[3], (void *)(&gp2x_sound_buffer[4+flyp]), gp2x_sound_buffer[1]);
-
- flip+=gp2x_sound_buffer[1]; if(flip==gp2x_sound_buffer[1]*8) flip=0;
- flyp+=gp2x_sound_buffer[1]; if(flyp==gp2x_sound_buffer[1]*8) flyp=0;
- }}
- return NULL;
-}
-
static void gp2x_initqueue(gp2x_queue *q, unsigned long queue_items, unsigned long *position920t, unsigned long *position940t)
{
q->head = q->tail = q->items = 0;
@@ -240,16 +221,6 @@
q->items++;
}
-#if 0
-/* UNUSED */
- static unsigned long gp2x_dequeue(gp2x_queue *q)
-{
- while(!q->items); /* waiting for head to increase... */
- q->items--;
- return q->place920t[q->tail = (q->tail < q->max_items ? q->tail+1 : 0)];
-}
-#endif
-
void gp2x_dualcore_pause(int yes) { if(yes) gp2x_memregs[0x0904>>1] &= 0xFFFE; else gp2x_memregs[0x0904>>1] |= 1; }
static void gp2x_940t_reset(int yes) { gp2x_memregs[0x3B48>>1] = ((yes&1) << 7) | (0x03); }
static void gp2x_940t_pause(int yes) { gp2x_dualcore_pause(yes); }
@@ -329,16 +300,10 @@
if(!gp2x_dev[0]) gp2x_dev[0] = open("/dev/fb0", O_RDWR);
if(!gp2x_dev[1]) gp2x_dev[1] = open("/dev/fb1", O_RDWR);
if(!gp2x_dev[2]) gp2x_dev[2] = open("/dev/mem", O_RDWR);
-#if 0
- md if(!gp2x_dev[3]) gp2x_dev[3] = open("/dev/dsp", O_WRONLY);
-#endif
if(!gp2x_dev[4]) gp2x_dev[4] = open("/dev/mixer", O_RDWR);
gp2x_dualcore_ram=(unsigned long *)mmap(0, 0x1000000, PROT_READ|PROT_WRITE, MAP_SHARED, gp2x_dev[2], 0x03000000);
-#if 0
- gp2x_dualcore_ram=(unsigned long *)mmap(0, 0x2000000, PROT_READ|PROT_WRITE, MAP_SHARED, gp2x_dev[2], 0x02000000);
-#endif
gp2x_memregl=(unsigned long *)mmap(0, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, gp2x_dev[2], 0xc0000000);
gp2x_memregs=(unsigned short *)gp2x_memregl;
@@ -366,20 +331,6 @@
if(bpp==8) gp2x_physvram[2]+=320*240, gp2x_physvram[3]+=320*240,
gp2x_logvram15[2]+=320*240/2, gp2x_logvram15[3]+=320*240/2;
-#if 0
- md ioctl(gp2x_dev[3], SNDCTL_DSP_SPEED, &rate);
- md ioctl(gp2x_dev[3], SNDCTL_DSP_SETFMT, &bits);
- md ioctl(gp2x_dev[3], SNDCTL_DSP_STEREO, &stereo);
-
- md gp2x_sound_buffer[1]=(gp2x_sound_buffer[0]=(rate/Hz)) << (stereo + (bits==16));
- md gp2x_sound_buffer[2]=(1000000/Hz);
-
- stereo = 0x00100009;ioctl(gp2x_dev[3], SNDCTL_DSP_SETFRAGMENT, &stereo);
-
- md if(first) { pthread_create( &gp2x_sound_thread, NULL, gp2x_sound_play, NULL);
- atexit(gp2x_deinit);
- first=0; }
-#endif
}
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/petui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/petui.c 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/petui.c 2008-05-23 02:04:09 UTC (rev 18799)
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <string.h>
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
#include "videoarch.h"
@@ -37,9 +38,6 @@
/* reserved for future sid cart support */
void petui_handle_sidengine_resource(int value)
{
-#if 0
- resources_set_int("SidEngine", value);
-#endif
}
int petui_handle_X(int Xvalue)
@@ -50,19 +48,6 @@
/* reserved for future sid cart support */
void petui_draw_resid_string(unsigned char *screen, int menu_x, int menu_y)
{
-#if 0
- int sidengine;
-
- resources_get_int("SidEngine", &sidengine);
- if(sidengine)
- {
- draw_ascii_string(screen, display_width, menu_x, menu_y, "ReSID", menu_fg, menu_bg);
- }
- else
- {
- draw_ascii_string(screen, display_width, menu_x, menu_y, "FastSID", menu_fg, menu_bg);
- }
-#endif
}
void petui_draw_memory_string(unsigned char *screen, int menu_x, int menu_y, int mem)
@@ -176,15 +161,6 @@
10,5, 0,0, /* runstop fixme */
11,5, 0,0, /* runstop fixme */
-#if 0
- 4,5, 8,2, /* space */
- 5,5, 8,2, /* */
- 6,5, 8,2, /* */
- 7,5, 8,2, /* */
- 8,5, 8,2, /* */
-/* keys found 1,4 is 7(diff keypad?) 0,4 is 8 (diff keypad?) 1,5, is an up arrow */
-/* 0,6 odd screen effect? moves it up */
-#endif
0
};
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/plus4ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/plus4ui.c 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/plus4ui.c 2008-05-23 02:04:09 UTC (rev 18799)
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <string.h>
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
#include "videoarch.h"
@@ -37,9 +38,6 @@
/* reserved for future sid cart support */
void plus4ui_handle_sidengine_resource(int value)
{
-#if 0
- resources_set_int("SidEngine", value);
-#endif
}
int plus4ui_handle_X(int Xvalue)
@@ -50,19 +48,6 @@
/* reserved for future sid cart support */
void plus4ui_draw_resid_string(unsigned char *screen, int menu_x, int menu_y)
{
-#if 0
- int sidengine;
-
- resources_get_int("SidEngine", &sidengine);
- if(sidengine)
- {
- draw_ascii_string(screen, display_width, menu_x, menu_y, "ReSID", menu_fg, menu_bg);
- }
- else
- {
- draw_ascii_string(screen, display_width, menu_x, menu_y, "FastSID", menu_fg, menu_bg);
- }
-#endif
}
void plus4ui_draw_memory_string(unsigned char *screen, int menu_x, int menu_y, int mem)
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/prefs_gp2x.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/prefs_gp2x.c 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/prefs_gp2x.c 2008-05-23 02:04:09 UTC (rev 18799)
@@ -30,22 +30,25 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include "minimal.h"
-#include "machine.h"
-#include "ui_gp2x.h"
-#include "input_gp2x.h"
-#include "prefs_gp2x.h"
-#include "videoarch.h"
#include <sys/types.h>
#include <dirent.h>
#include <sys/stat.h>
+
#include "attach.h"
#include "autostart.h"
-#include "resources.h"
-#include "imagecontents.h"
#include "cartridge.h"
+#include "imagecontents.h"
+#include "input_gp2x.h"
+#include "interrupt.h"
+#include "machine.h"
+#include "minimal.h"
+#include "prefs_gp2x.h"
+#include "resources.h"
#include "screenshot.h"
+#include "ui_gp2x.h"
#include "uiarch.h"
+#include "uitext_gp2x.h"
+#include "videoarch.h"
extern unsigned short *gp2x_memregs;
@@ -84,10 +87,6 @@
unsigned mdiv,pdiv=3,scale=0;
MHZ*=1000000;
mdiv=(MHZ*pdiv)/SYS_CLK_FREQ;
-#if 0
- printf ("Old value = %04X\r",MEM_REG[0x924>>1]," ");
- printf ("APLL = %04X\r",MEM_REG[0x91A>>1]," ");
-#endif
mdiv=((mdiv-8)<<8) & 0xff00;
pdiv=((pdiv-2)<<2) & 0xfc;
scale&=3;
@@ -110,9 +109,6 @@
gp2x_memregs[0x2906>>1]=614; /* scale horizontal */
if(tvout_pal) gp2x_memregs[0x2908>>1]=384; /* scale vertical PAL */
else gp2x_memregs[0x2908>>1]=460; /* scale vertical NTSC */
-#if 0
- gp2x_memregs[0x2908>>1]=430; /* scale vertical */
-#endif
} else {
gp2x_memregs[0x2906>>1]=1228; /* scale horizontal */
gp2x_memregs[0x2908>>1]=430; /* vertical */
@@ -185,23 +181,8 @@
char *contents_str;
static char *contents_list[255];
int row;
- static image_contents_t *contents;
- image_contents_file_list_t *prg_list;
-#if 0
- char tmp_string[255];
-#endif
int i;
-#if 0
- contents_list[0]="test1";
- contents_list[1]="test2";
- contents_list[2]="test3";
- contents_list[3]=NULL;
- num_items=3;
- cursor_pos=0;
- first_visible=0;
-#endif
-
if(num_items==0) {
contents_str=image_contents_read_string(IMAGE_CONTENTS_AUTO,
image, 8, IMAGE_CONTENTS_STRING_PETSCII);
@@ -223,51 +204,16 @@
draw_petscii_string(screen, display_width, MENU_X, MENU_Y,
contents_list[0], menu_fg, menu_bg);
-#if 0
- if(num_items==0) {
- contents=image_contents_read(IMAGE_CONTENTS_AUTO, image, 8);
- if(contents==NULL) return (char *)-1;
- prg_list=contents->file_list;
- for(num_items=0; prg_list!=NULL; num_items++) {
- prg_list=prg_list->next;
- }
- cursor_pos=0;
- first_visible=0;
- }
-
- draw_ascii_string(screen, display_width, MENU_X, MENU_Y, blank_line, menu_fg, menu_bg);
- draw_ascii_string(screen, display_width, MENU_X, MENU_Y,
- (char *)contents->name, menu_fg, menu_bg);
-
- prg_list=contents->file_list;
- for(i=0; i<first_visible; i++) prg_list=prg_list->next;
-#endif
-
row=0;
while(row<(num_items-1) && row<MENU_HEIGHT) {
if(row==(cursor_pos-first_visible)) {
bg=menu_hl;
-#if 0
- selected=(char *)prg_list->name;
-#endif
selected=contents_list[row+first_visible+1];
} else bg=menu_bg;
-#if 0
- if(dir_items[row+first_visible].type==0) {
- draw_ascii_string(screen, display_width, MENU_X, MENU_LS+(8*row), "<DIR> ", menu_fg, bg);
- }
- snprintf(tmp_string, 16, "%s", dir_items[row+first_visible].name);
- draw_ascii_string(screen, display_width, MENU_X+(8*6), MENU_LS+(8*row), tmp_string, menu_fg, bg);
- strncpy(tmp_string, prg_list->name, 255);
-#endif
draw_ascii_string(screen, display_width, MENU_X, MENU_LS+(8*row),
blank_line, menu_fg, bg);
draw_petscii_string(screen, display_width, MENU_X, MENU_LS+(8*row),
contents_list[row+first_visible+1], menu_fg, bg);
-#if 0
- (char *)prg_list->name, menu_fg, bg);
- prg_list=prg_list->next;
-#endif
row++;
}
while(row<MENU_HEIGHT) {
@@ -455,10 +401,6 @@
+strlen(dir_items[cursor_pos].name)
+2);
sprintf(path, "%s/%s", cwd, dir_items[cursor_pos].name);
-#if 0
- /* FIXME */
- for(i=0; i<num_items; i++) free(dir_items[i].name);
-#endif
if(dir_items[cursor_pos].type==0) {
/* directory selected */
pathlength=strlen(path);
@@ -466,16 +408,10 @@
/* check for . selected */
&& path[pathlength-2]=='/') {
path[pathlength-2]='\0';
-#if 0
- return path;
-#endif
} else if(path[pathlength-1]=='.'
/* check for .. selected */
&& path[pathlength-2]=='.'
&& path[pathlength-3]=='/') {
-#if 0
- &&pathlength>4) {
-#endif
for(i=4; i<pathlength && path[pathlength-i]!='/'; i++);
if(i<pathlength
&& path[(pathlength-i)+1]!='.'
@@ -485,12 +421,6 @@
path[0]='.';
path[1]='\0';
}
-#if 0
- if(strlen(path)<=5) {
- path[5]='/';
- path[6]='\0';
- }
-#endif
cwd=path;
} else {
cwd=path;
@@ -503,9 +433,6 @@
/* file selected */
return path;
}
-#if 0
- } else if(input_select) {
-#endif
} else if(input_x) {
input_x=0;
return (char *)-1;
@@ -526,7 +453,7 @@
void draw_prefs(unsigned char *screen) {
static int cursor_pos=0;
- unsigned char bg, fg;
+ unsigned char bg;
char tmp_string[1024];
char tmp_string2[1024];
char tmp_string3[1024];
@@ -542,12 +469,7 @@
static int attach_cart_vic20_a000=0;
static int attach_cart_vic20_b000=0;
static char *imagefile;
-#if 0
- static int xfiletype;
-#endif
- int update_prefs=0;
- int i,j;
- char zip_error_str[255];
+ int i;
option_txt[AUTOSTART]= "Autostart image... ";
option_txt[START]= "Browse d64... ";
@@ -630,40 +552,6 @@
imagefile=tmp_string2;
}
#endif
-#if 0
- if(!strcmp(imagefile+(strlen(imagefile)-4), ".sna")
- || !strcmp(imagefile+(strlen(imagefile)-4), ".SNA")) {
- TheC64->LoadSnapshot(imagefile);
- TheC64->Resume();
- sdl_prefs_open=false;
- } else if(!strcmp(imagefile+(strlen(imagefile)-4), ".prg")
- || !strcmp(imagefile+(strlen(imagefile)-4), ".PRG")) {
- char loadprg[255];
- for(i=strlen(imagefile); i>0; i--) {
- if(imagefile[i]=='/') break;
- }
- strcpy(loadprg, "\rLOAD\"");
- for(j=0; imagefile[i+1+j]; j++) {
- unsigned char c;
- c=imagefile[i+1+j];
- if ((c >= 'A') && (c <= 'Z') || (c >= 'a') && (c <= 'z')) c ^= 0x20;
- tmp_string[j]=c;
- }
- tmp_string[j]='\0';
- strcat(loadprg, tmp_string);
- strcat(loadprg, "\",8,1\rRUN\r");
- imagefile[i]='\0';
- strcpy(prefs->DrivePath[0], imagefile);
- kbd_buf_feed(loadprg);
- update_prefs=1;
- TheC64->Resume();
- sdl_prefs_open=false;
- } else {
- strcpy(prefs->DrivePath[0], imagefile);
- update_prefs=1;
- cursor_pos=LOADSTAR;
- }
-#endif
if(auto_start) {
autostart_autodetect(imagefile, NULL, 0, 0);
auto_start=0;
@@ -677,10 +565,6 @@
imagefile=NULL;
gotfilename=0;
} else {
-#if 0
- fprintf(stderr, "calling autostart %s, %s\n",
- imagefile, image_prg);
-#endif
autostart_autodetect(imagefile, image_prg, 0, 0);
manual_start=0;
getfilename=0;
@@ -756,21 +640,8 @@
} else if(cursor_pos==SIDENGINE) {
ui_handle_sidengine_resource(0);
} else if(cursor_pos==SCALED) {
-#if 0
- gp2x_memregs[0x2906>>1]=1024; /* scale horizontal */
- gp2x_memregs[0x2908>>1]=320; /* vertical */
- display_width=320;
- gp2x_memregs[0x290c>>1]=display_width; /* screen width */
-#endif
hwscaling=0;
display_set();
-#if 0
- } else if(cursor_pos==TVOUT) {
- gp2x_memregs[0x2800>>1]&=~0x300;
- tvout=0;
- tvout_pal=0;
- display_set();
-#endif
} else if(cursor_pos==CENTRED) {
xoffset=xoffset_uncentred;
yoffset=yoffset_uncentred;
@@ -806,23 +677,8 @@
} else if(cursor_pos==SIDENGINE) {
ui_handle_sidengine_resource(1);
} else if(cursor_pos==SCALED) {
-#if 0
- gp2x_memregs[0x2906>>1]=1228; /* scale horizontal */
- gp2x_memregs[0x2908>>1]=430; /* scale vertical */
- gp2x_memregs[0x2908>>1]=384; /* scale vertical */
- display_width=384;
- gp2x_memregs[0x290c>>1]=display_width; /* screen width */
-#endif
hwscaling=1;
display_set();
-#if 0
- } else if(cursor_pos==TVOUT) {
- gp2x_memregs[0x2800>>1]|=0x300;
- hwscaling=1;
- tvout=1;
- tvout_pal=1;
- display_set();
-#endif
} else if(cursor_pos==CENTRED) {
xoffset=xoffset_centred;
yoffset=yoffset_centred;
@@ -838,24 +694,6 @@
} else if(cursor_pos==X8) {
if (ui_set_ramblocks(1)==1) vic20_mem=5;
}
-#if 0
- if(cursor_pos==LIMITSPEED) {
- prefs->LimitSpeed=true;
- update_prefs=1;
- } else if(cursor_pos==RESET) {
- prefs->FastReset=true;
- update_prefs=1;
- } else if(cursor_pos==SOUND) {
- prefs->SIDType=SIDTYPE_DIGITAL;
- update_prefs=1;
- } else if(cursor_pos==RCONTROL) {
- control_reversed=1;
- } else if(cursor_pos==BRIGHTNESS) {
- set_luma(brightness+1, contrast);
- } else if(cursor_pos==CONTRAST) {
- set_luma(brightness, contrast+1);
- }
-#endif
}
if(input_b) {
@@ -920,10 +758,6 @@
}
closedir(snaps_dir);
}
-#if 0
- char *fname="test.sna";
- interrupt_maincpu_trigger_trap(write_snapshot, (void *)fname);
-#endif
sprintf(tmp_string2, "%s/%s", "./snapshots", tmp_string);
interrupt_maincpu_trigger_trap(write_snapshot, (void *)tmp_string2);
sprintf(tmp_string3, "%s/screen%04d.bmp", "./snapshots", snapnum-1);
@@ -933,64 +767,8 @@
resources_save("vicerc");
exit(0);
}
-#if 0
- if(cursor_pos==D64) {
- xfiletype=0;
- getfilename=true;
- } else if(cursor_pos==LOADSTAR) {
- kbd_buf_feed("\rLOAD\":*\",8,1\rRUN\r");
- TheC64->Resume();
- sdl_prefs_open=false;
- } else if(cursor_pos==LOADER) {
- load_prg(TheC64, c64loader, sizeof(c64loader));
- kbd_buf_feed("\rLOAD\"X\",8,1\rRUN\r");
- TheC64->Resume();
- sdl_prefs_open=false;
- } else if(cursor_pos==PRG) {
- xfiletype=1;
- getfilename=true;
- } else if(cursor_pos==LOAD_SNAP) {
- TheC64->LoadSnapshot("test.sna");
- TheC64->Resume();
- sdl_prefs_open=false;
- } else if(cursor_pos==SAVE_SNAP) {
-#ifdef __gp2x__
- chdir(AppDirPath);
- chdir("c64/snapshots/");
-#else
- chdir("/tmp/c64/snapshots/");
-#endif
- int freename=0;
- for(int snapnum=0; !freename; snapnum++) {
- DIR *snaps_dir=opendir(".");
- struct dirent *direntry;
- freename=1;
- while(direntry=readdir(snaps_dir)) {
- sprintf(tmp_string, "%04d.sna", snapnum);
- if(!strcmp(tmp_string, direntry->d_name)) freename=0;
- }
- closedir(snaps_dir);
- }
- TheC64->SaveSnapshot(tmp_string);
-
-
- /* save thumbnail */
- if(thumb_current) {
- sprintf(tmp_string2, "thumbs/%s.thm", tmp_string);
- FILE *thumb_file=fopen(tmp_string2, "w");
- fwrite(thumb_current, (DISPLAY_X/4)*(DISPLAY_Y/4), 1, thumb_file);
- fclose(thumb_file);
- }
-
- TheC64->Resume();
- sdl_prefs_open=false;
- }
-#endif
}
-#if 0
- for(i=0; option_txt[i]; i++) {
-#endif
for(i=0; i<NUM_OPTIONS; i++) {
bg=menu_bg;
if(i==cursor_pos) bg=menu_hl;
@@ -1076,28 +854,6 @@
"off", menu_fg, menu_bg);
}
-#if 0
- /* tv out */
- if(tvout) {
- draw_ascii_string(screen, display_width,
- MENU_X+(8*25), MENU_Y+(8*TVOUT),
- "(on)", menu_fg, menu_bg);
- } else {
- draw_ascii_string(screen, display_width,
- MENU_X+(8*25), MENU_Y+(8*TVOUT),
- "(off)", menu_fg, menu_bg);
- }
- if(tvout_pal) {
- draw_ascii_string(screen, display_width,
- MENU_X+(8*21), MENU_Y+(8*TVOUT),
- "PAL", menu_fg, menu_bg);
- } else {
- draw_ascii_string(screen, display_width,
- MENU_X+(8*21), MENU_Y+(8*TVOUT),
- "NTSC", menu_fg, menu_bg);
- }
-#endif
-
ui_draw_memory_string(screen,MENU_X+(8*21), MENU_Y+(8*X8), vic20_mem);
/* cpu speed */
@@ -1106,50 +862,4 @@
MENU_X+(8*21), MENU_Y+(8*CPUSPEED),
tmp_string, menu_fg, menu_bg);
-#if 0
- sprintf(tmp_string, "%d", brightness);
- draw_ascii_string(screen_base, 80+(8*23), 25+(8*BRIGHTNESS), tmp_string, black, fill_gray);
- sprintf(tmp_string, "%d", contrast);
- draw_ascii_string(screen_base, 80+(8*23), 25+(8*CONTRAST), tmp_string, black, fill_gray);
-#endif
-
-#if 0
- /* reset speed */
- if(prefs->FastReset) {
- draw_ascii_string(screen_base, 80+(8*23), 25+(8*RESET), "Fast", black, fill_gray);
- } else {
- draw_ascii_string(screen_base, 80+(8*23), 25+(8*RESET), "Slow", black, fill_gray);
- }
- /* limit speed */
- if(prefs->LimitSpeed) {
- draw_ascii_string(screen_base, 80+(8*23), 25+(8*LIMITSPEED), "On", black, fill_gray);
- } else {
- draw_ascii_string(screen_base, 80+(8*23), 25+(8*LIMITSPEED), "Off", black, fill_gray);
- }
- /* sound */
- if(prefs->SIDType==SIDTYPE_NONE) {
- draw_ascii_string(screen_base, 80+(8*23), 25+(8*SOUND), "Off", black, fill_gray);
- } else {
- draw_ascii_string(screen_base, 80+(8*23), 25+(8*SOUND), "On", black, fill_gray);
- }
- /* sound */
- /* control */
- if(control_reversed) {
- draw_ascii_string(screen_base, 80+(8*23), 25+(8*RCONTROL), "On", black, fill_gray);
- } else {
- draw_ascii_string(screen_base, 80+(8*23), 25+(8*RCONTROL), "Off", black, fill_gray);
- }
- if(scaled) {
- draw_ascii_string(screen_base, 80+(8*20), 25+(8*SCALED), "Scaled", black, fill_gray);
- } else {
- draw_ascii_string(screen_base, 80+(8*23), 25+(8*SCALED), "1:1", black, fill_gray);
- }
-#endif
-
-#if 0
- /* attached media */
- snprintf(tmp_string, 22, "%s", prefs->DrivePath[0]);
- draw_ascii_string(screen_base, 80, 25+(8*BLANK3), "drive 8 media: ", black, fill_gray);
- draw_ascii_string(screen_base, 80, 25+(8*BLANK4), tmp_string, black, fill_gray);
-#endif
}
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/uiarch.h
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/uiarch.h 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/uiarch.h 2008-05-23 02:04:09 UTC (rev 18799)
@@ -33,11 +33,6 @@
#define UI_CALLBACK(name) \
void name(void)
-#if 0
- void name(Widget w, ui_callback_data_t client_data,
- ui_callback_data_t call_data)
-#endif
-
typedef void * ui_callback_t;
typedef void * ui_callback_data_t;
typedef void * ui_keysym_t;
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/vic20ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/vic20ui.c 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/vic20ui.c 2008-05-23 02:04:09 UTC (rev 18799)
@@ -30,8 +30,10 @@
#include <string.h>
#include "cartridge.h"
+#include "keyboard.h"
#include "prefs_gp2x.h"
#include "resources.h"
+#include "uitext_gp2x.h"
#include "videoarch.h"
#include "vkeyboard_gp2x.h"
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/video.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/video.c 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/video.c 2008-05-23 02:04:09 UTC (rev 18799)
@@ -36,6 +36,7 @@
#include "videoarch.h"
#include "palette.h"
#include "machine.h"
+#include "input_gp2x.h"
int machine_ui_done=0;
int vicii_setup_delay=0;
@@ -48,19 +49,23 @@
int xoffset_centred, yoffset_centred;
int xoffset_uncentred, yoffset_uncentred;
-int video_init() {
+int video_init()
+{
return 0;
}
-int video_init_cmdline_options() {
+int video_init_cmdline_options()
+{
return 0;
}
-void video_shutdown() {
+void video_shutdown()
+{
}
video_canvas_t *video_canvas_create(video_canvas_t *canvas,
- unsigned int *width, unsigned int *height, int mapped) {
+ unsigned int *width, unsigned int *height, int mapped)
+{
static int vicii_setup=0;
display_width=320;
@@ -81,9 +86,6 @@
if(gp2x_memregs[0x2800>>1]&0x100) {
tvout=1;
hwscaling=1;
-#if 0
- tvout_pal=gp2x_memregs[0x2800>>1]&0x1000;
-#endif
if(gp2x_memregs[0x2818>>1]==239) tvout_pal=0;
printf("\n0x2818=%d\n", gp2x_memregs[0x2818>>1]);
display_set();
@@ -93,31 +95,23 @@
return canvas;
}
-void video_canvas_destroy(struct video_canvas_s *canvas) {
-#if 0
- fprintf(stderr, "calling undefined function %s\n", __func__);
-#endif
+void video_canvas_destroy(struct video_canvas_s *canvas)
+{
}
-void video_arch_canvas_init(struct video_canvas_s *canvas) {
+void video_arch_canvas_init(struct video_canvas_s *canvas)
+{
canvas->video_draw_buffer_callback=NULL;
}
void video_canvas_refresh(struct video_canvas_s *canvas,
unsigned int xs, unsigned int ys,
unsigned int xi, unsigned int yi,
- unsigned int w, unsigned int h) {
-#if 0
- fprintf(stderr, "calling %s\n", __func__);
- fprintf(stderr, "refresh xs=%d, ys=%d, xi=%d, yi=%d, w=%d, h=%d\n",
- xs, ys, xi, yi, w, h);
-#endif
+ unsigned int w, unsigned int h)
+{
BYTE *source;
register int x, y;
register int buf_width;
-#if 0
- register BYTE pixel;
-#endif
register int xoff;
register int yoff;
@@ -170,7 +164,8 @@
}
int video_canvas_set_palette(struct video_canvas_s *canvas,
- struct palette_s *palette) {
+ struct palette_s *palette)
+{
fprintf(stderr, "calling %s\n", __func__);
int i;
for(i=0; i<palette->num_entries; i++) {
@@ -180,35 +175,27 @@
gp2x_palette[i*2+1]=palette->entries[i].red;
}
gp2x_video_setpalette();
+ return 0;
}
-int video_arch_resources_init() {
-#if 0
- fprintf(stderr, "calling undefined function %s\n", __func__);
-#endif
+int video_arch_resources_init()
+{
+ return 0;
}
void video_canvas_resize(struct video_canvas_s *canvas,
- unsigned int width, unsigned int height) {
-#if 0
- fprintf(stderr, "calling undefined function %s\n", __func__);
-#endif
+ unsigned int width, unsigned int height)
+{
}
-void video_arch_resources_shutdown() {
-#if 0
- fprintf(stderr, "calling undefined function %s\n", __func__);
-#endif
+void video_arch_resources_shutdown()
+{
}
-void video_add_handlers() {
-#if 0
- fprintf(stderr, "calling undefined function %s\n", __func__);
-#endif
+void video_add_handlers()
+{
}
-void fullscreen_capability() {
-#if 0
- fprintf(stderr, "calling undefined function %s\n", __func__);
-#endif
+void fullscreen_capability()
+{
}
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/vkeyboard_gp2x.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/vkeyboard_gp2x.c 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/vkeyboard_gp2x.c 2008-05-23 02:04:09 UTC (rev 18799)
@@ -123,10 +123,6 @@
for(i=0; keytable[i]; i+=4) {
if((cursor_x-(vkeyb_x/8)==keytable[i])
&& (cursor_y-(vkeyb_y/8)==keytable[i+1])) {
-#if 0
- vkey=keytable[i+2];
- if(shifted) vkey|=128;
-#endif
vkey_row=keytable[i+2];
vkey_column=keytable[i+3];
vkey_pressed=1;
Modified: branches/marco/ports/vice/src/arch/unix/gp2x/vsidui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gp2x/vsidui.c 2008-05-22 20:11:25 UTC (rev 18798)
+++ branches/marco/ports/vice/src/arch/unix/gp2x/vsidui.c 2008-05-23 02:04:09 UTC (rev 18799)
@@ -68,84 +68,14 @@
{ NULL }
};
-static UI_CALLBACK(psid_load)
-{
- char *filename;
- ui_button_t button;
- filename = ui_select_file(_("Load PSID file"), NULL, 0, False, NULL,
- "*.[psPS]*", &button, False, NULL);
-
- vsync_suspend_speed_eval();
-
- switch (button) {
- case UI_BUTTON_OK:
- if (machine_autodetect_psid(filename) < 0) {
- log_error(vsid_log, _("`%s' is not a valid PSID file."), filename);
- return;
- }
- psid_init_driver();
- machine_play_psid(0);
- machine_trigger_reset(MACHINE_RESET_MODE_SOFT);
- vsid_create_menus();
- break;
- default:
- /* Do nothing special. */
- break;
- }
- if (filename != NULL)
- lib_free(filename);
-}
-
-static ui_menu_entry_t ui_load_commands_menu[] = {
- { N_("Load PSID file..."),
- (ui_callback_t)psid_load, NULL, NULL,
- XK_l, UI_HOTMOD_META },
- { NULL }
-};
-
-
/* ------------------------------------------------------------------------- */
-UI_MENU_DEFINE_RADIO(MachineVideoStandard)
-
-static ui_menu_entry_t set_video_standard_submenu_vsid[] = {
- { 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 },
- { N_("*Old NTSC-M"), (ui_callback_t)radio_MachineVideoStandard,
- (ui_callback_data_t)MACHINE_SYNC_NTSCOLD, NULL },
- { NULL }
-};
-
-static ui_menu_entry_t ui_sound_settings_menu_vsid[] = {
- { N_("Sound settings"),
- NULL, NULL, sound_settings_submenu },
- { NULL }
-};
-
-UI_MENU_DEFINE_TOGGLE(PSIDKeepEnv)
-
-static ui_menu_entry_t psid_menu[] = {
- { N_("*Override PSID settings"),
- (ui_callback_t)toggle_PSIDKeepEnv, NULL, NULL },
- { N_("SID settings"),
- NULL, NULL, sid_submenu },
- { N_("Video standard"),
- NULL, NULL, set_video_standard_submenu_vsid },
- { NULL }
-};
-
-
-/* ------------------------------------------------------------------------- */
-
extern int num_checkmark_menu_items;
static void vsid_create_menus(void)
{
static ui_menu_entry_t tune_menu[256];
- static ui_window_t wl = NULL, wr = NULL;
static int tunes = 0;
int default_tune;
int i;
@@ -189,7 +119,6 @@
int vsid_ui_init(void)
{
- int res;
video_canvas_t canvas;
video_add_handlers(&canvas);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-05-22 20:11:42
|
Revision: 18798
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18798&view=rev
Author: blackystardust
Date: 2008-05-22 13:11:25 -0700 (Thu, 22 May 2008)
Log Message:
-----------
Fixed riscos warnings/issues
Modified Paths:
--------------
branches/marco/ports/vice/src/arch/riscos/spritedrv.c
branches/marco/ports/vice/src/arch/riscos/ui.c
branches/marco/ports/vice/src/arch/riscos/video.c
branches/marco/ports/vice/src/arch/riscos/videoarch.h
branches/marco/ports/vice/src/fsdevice/fsdevice-close.c
branches/marco/ports/vice/src/keyboard.c
branches/marco/ports/vice/src/zfile.c
Modified: branches/marco/ports/vice/src/arch/riscos/spritedrv.c
===================================================================
--- branches/marco/ports/vice/src/arch/riscos/spritedrv.c 2008-05-22 16:36:49 UTC (rev 18797)
+++ branches/marco/ports/vice/src/arch/riscos/spritedrv.c 2008-05-22 20:11:25 UTC (rev 18798)
@@ -68,7 +68,7 @@
int bpp, pal_size, pal_bytes, header_size;
unsigned int *sprpalette;
sprite_area_t *sarea;
- int x;
+ unsigned int x;
if (pal->num_entries <= 2)
{
Modified: branches/marco/ports/vice/src/arch/riscos/ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/riscos/ui.c 2008-05-22 16:36:49 UTC (rev 18797)
+++ branches/marco/ports/vice/src/arch/riscos/ui.c 2008-05-22 20:11:25 UTC (rev 18798)
@@ -216,7 +216,7 @@
static int WasAutoPaused = 0;
static int SoundVolume;
static int DisplayFPS = 0;
-static int DisplayDriveTrack = 0;
+static unsigned int DisplayDriveTrack = 0;
static int WimpScrapUsed = 0;
static int JoystickWindowOpen = 0;
static int WithinUiPoll = 0;
@@ -1526,7 +1526,7 @@
}
else
{
- if (ui_image_contents_disk(name) != 0);
+ if (ui_image_contents_disk(name) != 0)
return -1;
}
}
Modified: branches/marco/ports/vice/src/arch/riscos/video.c
===================================================================
--- branches/marco/ports/vice/src/arch/riscos/video.c 2008-05-22 16:36:49 UTC (rev 18797)
+++ branches/marco/ports/vice/src/arch/riscos/video.c 2008-05-22 20:11:25 UTC (rev 18798)
@@ -646,7 +646,7 @@
trans[i] = ct[i];
}
}
- for (; i<maxVideoCanvasColours; i++) trans[i] = 0;
+ for (; i<(unsigned int)maxVideoCanvasColours; i++) trans[i] = 0;
}
canvas->fb.transdirty = 0;
@@ -1080,7 +1080,7 @@
const palette_entry_t *p;
unsigned int numsprpal;
unsigned int *ct;
- int i;
+ unsigned int i;
if (palette == NULL) return 0;
@@ -1089,7 +1089,7 @@
lib_free(canvas->current_palette);
}
canvas->num_colours = palette->num_entries;
- if (canvas->num_colours > maxVideoCanvasColours)
+ if (canvas->num_colours > (unsigned int)maxVideoCanvasColours)
canvas->num_colours = maxVideoCanvasColours;
canvas->current_palette = lib_malloc((canvas->num_colours)*sizeof(int));
@@ -1185,7 +1185,7 @@
canvas->height *= 2;
canvas->num_colours = (canvas->palette == NULL) ? 16 : canvas->palette->num_entries;
- if (canvas->num_colours > maxVideoCanvasColours)
+ if (canvas->num_colours > (unsigned int)maxVideoCanvasColours)
canvas->num_colours = maxVideoCanvasColours;
canvas->current_palette = NULL;
canvas->shiftx = 0; canvas->shifty = 0; canvas->scale = 1;
Modified: branches/marco/ports/vice/src/arch/riscos/videoarch.h
===================================================================
--- branches/marco/ports/vice/src/arch/riscos/videoarch.h 2008-05-22 16:36:49 UTC (rev 18797)
+++ branches/marco/ports/vice/src/arch/riscos/videoarch.h 2008-05-22 20:11:25 UTC (rev 18798)
@@ -31,6 +31,7 @@
#include "vice.h"
#include "types.h"
+#include "video.h"
#include "wlsprite.h"
Modified: branches/marco/ports/vice/src/fsdevice/fsdevice-close.c
===================================================================
--- branches/marco/ports/vice/src/fsdevice/fsdevice-close.c 2008-05-22 16:36:49 UTC (rev 18797)
+++ branches/marco/ports/vice/src/fsdevice/fsdevice-close.c 2008-05-22 20:11:25 UTC (rev 18798)
@@ -36,6 +36,10 @@
#include <stdio.h>
+#ifdef __riscos
+#include "archdep.h"
+#endif
+
#include "cbmdos.h"
#include "fileio.h"
#include "fsdevice-close.h"
Modified: branches/marco/ports/vice/src/keyboard.c
===================================================================
--- branches/marco/ports/vice/src/keyboard.c 2008-05-22 16:36:49 UTC (rev 18797)
+++ branches/marco/ports/vice/src/keyboard.c 2008-05-22 20:11:25 UTC (rev 18798)
@@ -110,7 +110,9 @@
}
/*-----------------------------------------------------------------------*/
+#ifdef COMMON_KBD
static void keyboard_key_clear_internal(void);
+#endif
static void keyboard_event_record(void)
{
Modified: branches/marco/ports/vice/src/zfile.c
===================================================================
--- branches/marco/ports/vice/src/zfile.c 2008-05-22 16:36:49 UTC (rev 18797)
+++ branches/marco/ports/vice/src/zfile.c 2008-05-22 20:11:25 UTC (rev 18798)
@@ -314,6 +314,7 @@
}
/* is the name zipcode -name? */
+#ifndef __riscos
static int is_zipcode_name(char *name)
{
if (name[0] >= '1' && name[0] <= '4' && name[1] == '!')
@@ -356,8 +357,8 @@
}
return 0;
}
+#endif
-
/* If `name' has a correct extension, try to list its contents and search for
the first file with a proper extension; if found, extract it. If this
succeeds, return the name of the temporary file; if the archive file is
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-05-22 16:36:41
|
Revision: 18797
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18797&view=rev
Author: blackystardust
Date: 2008-05-22 09:36:49 -0700 (Thu, 22 May 2008)
Log Message:
-----------
Fixed msdos warnings/issues
Modified Paths:
--------------
branches/marco/ports/vice/src/arch/msdos/cbm2ui.c
branches/marco/ports/vice/src/arch/msdos/console.c
branches/marco/ports/vice/src/arch/msdos/joy.c
branches/marco/ports/vice/src/arch/msdos/petui.c
branches/marco/ports/vice/src/arch/msdos/plus4ui.c
branches/marco/ports/vice/src/arch/msdos/ui.c
branches/marco/ports/vice/src/arch/msdos/uijoystick.c
branches/marco/ports/vice/src/arch/msdos/uinetplay.c
branches/marco/ports/vice/src/arch/msdos/uiperipherial.c
branches/marco/ports/vice/src/arch/msdos/video.c
branches/marco/ports/vice/src/network.c
branches/marco/ports/vice/src/sounddrv/soundallegro.c
Modified: branches/marco/ports/vice/src/arch/msdos/cbm2ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/msdos/cbm2ui.c 2008-05-22 06:42:12 UTC (rev 18796)
+++ branches/marco/ports/vice/src/arch/msdos/cbm2ui.c 2008-05-22 16:36:49 UTC (rev 18797)
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "cbm2ui.h"
#include "menudefs.h"
Modified: branches/marco/ports/vice/src/arch/msdos/console.c
===================================================================
--- branches/marco/ports/vice/src/arch/msdos/console.c 2008-05-22 06:42:12 UTC (rev 18796)
+++ branches/marco/ports/vice/src/arch/msdos/console.c 2008-05-22 16:36:49 UTC (rev 18797)
@@ -33,6 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <string.h>
#include "console.h"
#include "lib.h"
Modified: branches/marco/ports/vice/src/arch/msdos/joy.c
===================================================================
--- branches/marco/ports/vice/src/arch/msdos/joy.c 2008-05-22 06:42:12 UTC (rev 18796)
+++ branches/marco/ports/vice/src/arch/msdos/joy.c 2008-05-22 16:36:49 UTC (rev 18797)
@@ -40,9 +40,6 @@
#include "types.h"
-/* Notice that this has to be `int' to make resources work. */
-static int keyset1[9], keyset2[9];
-
#ifdef COMMON_KBD
int joystick_port_map[2];
#endif
Modified: branches/marco/ports/vice/src/arch/msdos/petui.c
===================================================================
--- branches/marco/ports/vice/src/arch/msdos/petui.c 2008-05-22 06:42:12 UTC (rev 18796)
+++ branches/marco/ports/vice/src/arch/msdos/petui.c 2008-05-22 16:36:49 UTC (rev 18797)
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "lib.h"
#include "menudefs.h"
Modified: branches/marco/ports/vice/src/arch/msdos/plus4ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/msdos/plus4ui.c 2008-05-22 06:42:12 UTC (rev 18796)
+++ branches/marco/ports/vice/src/arch/msdos/plus4ui.c 2008-05-22 16:36:49 UTC (rev 18797)
@@ -28,6 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "lib.h"
#include "menudefs.h"
Modified: branches/marco/ports/vice/src/arch/msdos/ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/msdos/ui.c 2008-05-22 06:42:12 UTC (rev 18796)
+++ branches/marco/ports/vice/src/arch/msdos/ui.c 2008-05-22 16:36:49 UTC (rev 18797)
@@ -35,6 +35,7 @@
#include <stdio.h>
#include <sys/movedata.h>
#include <unistd.h>
+#include <string.h>
#include "cmdline.h"
#include "datasette.h"
@@ -75,19 +76,19 @@
/* UI-related resources and command-line options. */
/* Flag: Use keyboard LEDs? */
-static int use_leds;
+static unsigned int use_leds;
-static int statusbar_is_enabled;
+static unsigned int statusbar_is_enabled;
-static int set_use_leds(resource_value_t v, void *param)
+static int set_use_leds(int v, void *param)
{
- use_leds = (int)v;
+ use_leds = v;
return 0;
}
-static int set_statusbar_enabled(resource_value_t v, void *param)
+static int set_statusbar_enabled(int v, void *param)
{
- statusbar_is_enabled = (int)v;
+ statusbar_is_enabled = v;
if (statusbar_enabled()) {
statusbar_prepare();
statusbar_update();
Modified: branches/marco/ports/vice/src/arch/msdos/uijoystick.c
===================================================================
--- branches/marco/ports/vice/src/arch/msdos/uijoystick.c 2008-05-22 06:42:12 UTC (rev 18796)
+++ branches/marco/ports/vice/src/arch/msdos/uijoystick.c 2008-05-22 16:36:49 UTC (rev 18797)
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <allegro.h>
+#include <string.h>
#include "joy.h"
#include "lib.h"
Modified: branches/marco/ports/vice/src/arch/msdos/uinetplay.c
===================================================================
--- branches/marco/ports/vice/src/arch/msdos/uinetplay.c 2008-05-22 06:42:12 UTC (rev 18796)
+++ branches/marco/ports/vice/src/arch/msdos/uinetplay.c 2008-05-22 16:36:49 UTC (rev 18797)
@@ -104,7 +104,7 @@
char buf[10];
resources_get_int("NetworkServerPort", ¤t_port);
- sprintf(buf,"%d\0",current_port);
+ sprintf(buf,"%d",current_port);
if (tui_input_string("TCP Port", "Enter TCP Port to use:", buf, 10) == 0)
{
Modified: branches/marco/ports/vice/src/arch/msdos/uiperipherial.c
===================================================================
--- branches/marco/ports/vice/src/arch/msdos/uiperipherial.c 2008-05-22 06:42:12 UTC (rev 18796)
+++ branches/marco/ports/vice/src/arch/msdos/uiperipherial.c 2008-05-22 16:36:49 UTC (rev 18797)
@@ -28,6 +28,7 @@
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#include "fsdevice.h"
#include "lib.h"
@@ -68,7 +69,7 @@
if (been_activated) {
char *path;
- int len = 255;
+ unsigned int len = 255;
resources_get_string(rname, &v);
if (len < strlen(v) * 2)
Modified: branches/marco/ports/vice/src/arch/msdos/video.c
===================================================================
--- branches/marco/ports/vice/src/arch/msdos/video.c 2008-05-22 06:42:12 UTC (rev 18796)
+++ branches/marco/ports/vice/src/arch/msdos/video.c 2008-05-22 16:36:49 UTC (rev 18797)
@@ -348,7 +348,7 @@
static void canvas_change_palette(video_canvas_t *c)
{
- int i;
+ unsigned int i;
int col;
int next_avail = 0;
Modified: branches/marco/ports/vice/src/network.c
===================================================================
--- branches/marco/ports/vice/src/network.c 2008-05-22 06:42:12 UTC (rev 18796)
+++ branches/marco/ports/vice/src/network.c 2008-05-22 16:36:49 UTC (rev 18797)
@@ -95,10 +95,10 @@
#if !defined(AMIGA_SUPPORT) && !defined(VMS)
#include <sys/select.h>
#endif
+#endif
#if !defined(AMIGA_M68K) && !defined(AMIGA_AROS)
#include <unistd.h>
#endif
-#endif
#ifdef OPENSERVER6_COMPILE
struct timeval {
Modified: branches/marco/ports/vice/src/sounddrv/soundallegro.c
===================================================================
--- branches/marco/ports/vice/src/sounddrv/soundallegro.c 2008-05-22 06:42:12 UTC (rev 18796)
+++ branches/marco/ports/vice/src/sounddrv/soundallegro.c 2008-05-22 16:36:49 UTC (rev 18797)
@@ -64,7 +64,7 @@
/* Number of samples already written; if this value is greater than the
buffer size, it's equal to the buffer size. This is a hack for the first
few writes. */
-static int written_samples;
+static unsigned int written_samples;
/* ------------------------------------------------------------------------- */
@@ -96,7 +96,7 @@
static int allegro_init_sound(const char *param, int *speed,
int *fragsize, int *fragnr, int *channels)
{
- int i;
+ unsigned int i;
/* No stereo capability. */
*channels = 1;
@@ -155,8 +155,8 @@
Notice that we also assume that the part of the buffer we are
going to lock is small enough to fit in the safe space. */
while (1) {
- int pos = sizeof(SWORD) * voice_get_position(voice);
- int pos2 = pos + fragment_size;
+ unsigned int pos = sizeof(SWORD) * voice_get_position(voice);
+ unsigned int pos2 = pos + fragment_size;
if (pos2 < buffer_len) {
if (buffer_offset >= pos2 || write_end < pos)
@@ -171,7 +171,7 @@
/* Write fragment. */
{
- int j;
+ unsigned int j;
WORD *p = (WORD *) (buffer->data + buffer_offset);
/* XXX: Maybe the SID engine could already produce samples in
@@ -200,7 +200,7 @@
static int allegro_bufferspace(void)
{
- int pos, ret;
+ int ret, pos;
/* voice_get_position returns current position in samples. */
pos = voice_get_position(voice) * sizeof(SWORD);
@@ -210,7 +210,7 @@
ret /= sizeof(SWORD);
- if (ret > written_samples)
+ if (ret > (int)written_samples)
ret = written_samples;
return buffer_len/sizeof(SWORD) - ret;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-05-22 06:42:05
|
Revision: 18796
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18796&view=rev
Author: blackystardust
Date: 2008-05-21 23:42:12 -0700 (Wed, 21 May 2008)
Log Message:
-----------
Added some of the new monitor features from VICEplus, fixed some errors and warnings.
Modified Paths:
--------------
branches/marco/ports/vice/Makefile.am
branches/marco/ports/vice/src/arch/os2/archdep.c
branches/marco/ports/vice/src/arch/os2/blockdev.c
branches/marco/ports/vice/src/arch/os2/dialogs/dlg-cmdopt.c
branches/marco/ports/vice/src/arch/os2/dialogs/dlg-drive.c
branches/marco/ports/vice/src/arch/os2/dialogs/dlg-fileio.c
branches/marco/ports/vice/src/arch/os2/dialogs/dlg-joystick.c
branches/marco/ports/vice/src/arch/os2/dialogs/dlg-monitor.c
branches/marco/ports/vice/src/arch/os2/dialogs/menubar.c
branches/marco/ports/vice/src/arch/os2/fullscr.c
branches/marco/ports/vice/src/arch/os2/kbd/parse.c
branches/marco/ports/vice/src/arch/os2/ui.c
branches/marco/ports/vice/src/arch/os2/uimon.c
branches/marco/ports/vice/src/arch/os2/video.c
branches/marco/ports/vice/src/arch/os2/vsidui.c
branches/marco/ports/vice/src/arch/unix/gui/vsidui.c
branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c
branches/marco/ports/vice/src/arch/win32/intl.c
branches/marco/ports/vice/src/arch/win32/ui.c
branches/marco/ports/vice/src/arch/win32/watcom/c64.tgt
branches/marco/ports/vice/src/arch/win32/watcom/monitor.tgt
branches/marco/ports/vice/src/arch/win32/watcom/plus4.tgt
branches/marco/ports/vice/src/arch/win32/watcom/vic20.tgt
branches/marco/ports/vice/src/c64/c64io.c
branches/marco/ports/vice/src/c64/cart/c64cart.c
branches/marco/ports/vice/src/c64/mmc64.c
branches/marco/ports/vice/src/cartconv.c
branches/marco/ports/vice/src/crtc/crtc.c
branches/marco/ports/vice/src/drive/rotation.c
branches/marco/ports/vice/src/joystick.c
branches/marco/ports/vice/src/monitor/mon_command.c
branches/marco/ports/vice/src/monitor/mon_file.c
branches/marco/ports/vice/src/monitor/mon_file.h
branches/marco/ports/vice/src/monitor/mon_lex.c
branches/marco/ports/vice/src/monitor/mon_lex.l
branches/marco/ports/vice/src/monitor/mon_memory.c
branches/marco/ports/vice/src/monitor/mon_parse.c
branches/marco/ports/vice/src/monitor/mon_parse.h
branches/marco/ports/vice/src/monitor/mon_parse.y
branches/marco/ports/vice/src/monitor/monitor.c
branches/marco/ports/vice/src/monitor/montypes.h
branches/marco/ports/vice/src/monitor.h
branches/marco/ports/vice/src/sounddrv/soundmmos2.c
branches/marco/ports/vice/src/sounddrv/soundmp3.c
branches/marco/ports/vice/src/tape/tape.c
branches/marco/ports/vice/src/translate.c
branches/marco/ports/vice/src/translate.txt
branches/marco/ports/vice/src/vic20/vic20cartridge.c
Modified: branches/marco/ports/vice/Makefile.am
===================================================================
--- branches/marco/ports/vice/Makefile.am 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/Makefile.am 2008-05-22 06:42:12 UTC (rev 18796)
@@ -147,7 +147,7 @@
endif
@MAKE_BINDIST_TRUE@installvice:
-@MAKE_BINDIST_TRUE@ echo this platform doesn\'t use \"make install\", use \"make bindist\" instead
+@MAKE_BINDIST_TRUE@ @echo this platform doesn\'t use \"make install\", use \"make bindist\" instead
@MAKE_BINDIST_FALSE@installvice: install-recursive
Modified: branches/marco/ports/vice/src/arch/os2/archdep.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/archdep.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/archdep.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -234,7 +234,9 @@
FILE *archdep_open_default_log_file()
{
+#ifndef __X1541__
int val;
+#endif
char *fname = util_concat(archdep_boot_path(), "\\vice2.log", NULL);
fLog = fopen(fname, "w");
Modified: branches/marco/ports/vice/src/arch/os2/blockdev.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/blockdev.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/blockdev.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -37,9 +37,6 @@
/*static log_t blockdev_log = LOG_DEFAULT;*/
-static int device;
-
-
int blockdev_open(const char *name, unsigned int *read_only)
{
return -1;
Modified: branches/marco/ports/vice/src/arch/os2/dialogs/dlg-cmdopt.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/dialogs/dlg-cmdopt.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/dialogs/dlg-cmdopt.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -39,6 +39,10 @@
#include <stdio.h>
#include <string.h>
+#ifdef WATCOM_COMPILE
+#include <process.h>
+#endif
+
#include "dialogs.h"
#include "menubar.h"
Modified: branches/marco/ports/vice/src/arch/os2/dialogs/dlg-drive.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/dialogs/dlg-drive.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/dialogs/dlg-drive.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -327,7 +327,6 @@
{
const HWND lbox = WinWindowFromID(hwnd, CBS_TYPE);
- int i;
int type=0;
int val;
int res;
Modified: branches/marco/ports/vice/src/arch/os2/dialogs/dlg-fileio.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/dialogs/dlg-fileio.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/dialogs/dlg-fileio.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -122,12 +122,14 @@
{NULL}
};
+#if defined(__X64__) || defined(__X128__) || defined(__XPET__) || defined(__XCBM__)
static filter_t FilterCart[] = {
{"*.crt; *.bin", "All Cartridge Images" },
{"*.crt", "CRT" },
{"*.bin", "BIN" },
{NULL}
};
+#endif
static filter_t FilterPal[] = {{"*.vpl", "Vice/2 Color Palette" }, {NULL}};
static filter_t FilterVsf[] = {{"*.vsf", "Vice/2 Snapshot File" }, {NULL}};
@@ -140,7 +142,11 @@
static filter_t FilterKernal[] = {{"kernal*", "Kernal ROM" }, {NULL}};
static filter_t FilterBasic[] = {{"basic*", "Basic ROM" }, {NULL}};
static filter_t FilterChargen[] = {{"charg*", "Character ROM" }, {NULL}};
+
+#ifdef __X128__
static filter_t FilterZ80[] = {{"z80bios*", "Z80 BIOS" }, {NULL}};
+#endif
+
static filter_t Filter1541[] = {{"dos1541*", "1541 ROM" }, {NULL}};
static filter_t Filter15412[] = {{"d1541II*", "1541-II ROM" }, {NULL}};
static filter_t Filter1571[] = {{"dos1571*", "1571 ROM" }, {NULL}};
@@ -168,7 +174,11 @@
static subaction_t SubTape[] = {{ "as Tape to Datasette", FilterTape }, {NULL}};
static subaction_t SubKbd[] = {{ "as new keyboard mapping", FilterKbd }, {NULL}};
static subaction_t SubCfg[] = {{ "as new configuration", FilterCfg }, {NULL}};
+
+#if defined __X64__ || defined __X128__
static subaction_t SubCart2[] = {{ "as cartridge image", FilterCart }, {NULL}};
+#endif
+
static subaction_t SubVsf[] = {{ "as Vice/2 snapshot file", FilterVsf }, {NULL}};
static subaction_t SubRomSet[] = {{ "as Vice/2 rom set", FilterRomSet},{NULL}};
@@ -629,8 +639,6 @@
static void ShowContents(HWND hwnd, char *image_name)
{
- int ascii;
- char *text;
image_contents_t *image;
image_contents_screencode_t *line;
image_contents_screencode_t *lines;
Modified: branches/marco/ports/vice/src/arch/os2/dialogs/dlg-joystick.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/dialogs/dlg-joystick.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/dialogs/dlg-joystick.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -61,9 +61,6 @@
static MRESULT EXPENTRY pm_joystick(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
{
- const int ID_ON = 1;
- const int ID_OFF = 2;
-
switch (msg)
{
case WM_INITDLG:
@@ -160,8 +157,6 @@
break;
case WM_SETDLGS:
{
- HWND hwnd2;
-
int joy1 = (int)mp1;
int joy2 = (int)mp2;
int joys = joy1 | joy2;
Modified: branches/marco/ports/vice/src/arch/os2/dialogs/dlg-monitor.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/dialogs/dlg-monitor.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/dialogs/dlg-monitor.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -38,6 +38,10 @@
#include <os2.h>
+#ifdef WATCOM_COMPILE
+#include <process.h>
+#endif
+
#include "dialogs.h"
#include "dlg-monitor.h"
@@ -73,17 +77,6 @@
// --------------------------------------------------------------------------
-static char *fmt(unsigned int val, unsigned char sz)
-{
- static char txt[5];
-
- char tmp[7];
- sprintf(tmp, "%%0%ix", sz);
- sprintf(txt, tmp, val);
-
- return txt;
-}
-
static const char *mon_dis(MEMSPACE mem, WORD loc, unsigned int *size)
{
const BYTE op = mon_get_mem_val(mem, loc);
Modified: branches/marco/ports/vice/src/arch/os2/dialogs/menubar.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/dialogs/menubar.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/dialogs/menubar.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -113,9 +113,11 @@
#if defined HAVE_CRTC && !defined __XCBM__
static const char *VIDEO_CACHE="CrtcVideoCache";
+#ifdef HAVE_PAL
static const char *DOUBLE_SIZE="CrtcDoubleSize";
static const char *DOUBLE_SCAN="CrtcDoubleScan";
#endif
+#endif
/*
#if defined __X64__ || defined __X128__ || defined __XVIC__ || defined __XPLUS4__
static const char *VIDEO_CACHE="ViciiVideoCache";
@@ -698,7 +700,7 @@
case IDM_VCACHE:
#ifdef __XCBM__
{
- long val;
+ int val;
resources_get_int("UseVicII", &val);
toggle(val?VIDEO_CACHE:"CrtcVideoCache");
}
Modified: branches/marco/ports/vice/src/arch/os2/fullscr.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/fullscr.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/fullscr.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -376,11 +376,7 @@
SWP swp;
GDDMODEINFO *mode;
- unsigned int maxw = -1;
- unsigned int maxh = -1;
- unsigned int rate = -1;
FOURCC fcc = fccColorEncoding;
- int l;
WinQueryWindowPos(hwnd, &swp);
@@ -444,8 +440,6 @@
GDDMODEINFO *mode;
FOURCC fcc = fccColorEncoding;
- int l;
-
if (!hmodVMAN || !fFullScreenMode)
return;
Modified: branches/marco/ports/vice/src/arch/os2/kbd/parse.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/kbd/parse.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/kbd/parse.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -127,7 +127,6 @@
shift = atoi(p);
{
- int s;
switch (buffer[0])
{
case '#':
@@ -162,7 +161,7 @@
case '!': // keyword handling
{
char *p;
- int num, row, col, shift;
+ int row, col;
p = strtok(buffer+1, " \t:");
if (!p)
Modified: branches/marco/ports/vice/src/arch/os2/ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/ui.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/ui.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -279,9 +279,6 @@
void ui_display_drive_current_image(unsigned int drive_number,
const char *image)
{
- const ULONG flCmd =
- DT_TEXTATTRS|DT_VCENTER|DT_LEFT|DT_ERASERECT|DT_WORDBREAK;
-
if (image && *image)
{
int pos=0, i;
Modified: branches/marco/ports/vice/src/arch/os2/uimon.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/uimon.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/uimon.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -113,7 +113,7 @@
if (!out) out = lib_calloc(1,1);
- txt=buffer;
+ txt=(char *)buffer;
eol = strchr(txt, '\n');
while (strrchr(txt,'\n') && eol!= txt+strlen(txt))
Modified: branches/marco/ports/vice/src/arch/os2/video.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/video.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/video.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -61,6 +61,10 @@
#include <graph.h>
#endif
+#ifdef WATCOM_COMPILE
+#include <process.h>
+#endif
+
#include "video.h"
#include "videoarch.h"
@@ -254,19 +258,19 @@
lib_free(txt);
}
}
- /*
+#if 0
else
{
- extern FNVMIENTRY *pfnVMIEntry; // The entry of VMAN.DLL
+ extern FNVMIENTRY *pfnVMIEntry;
TEXTBLTINFO txt;
memset(&txt, 0, sizeof(TEXTBLTINFO));
txt.ulLength = sizeof(TEXTBLTINFO);
- (*pfnVMIEntry)(0, 18/*VMI_CMD_TEXT/, &txt, 0);
+ (*pfnVMIEntry)(0, 18 VMI_CMD_TEXT/, &txt, 0);
}
- */
+#endif
}
/* ------------------------------------------------------------------------ */
@@ -886,8 +890,6 @@
void WmDestroy(HWND hwnd)
{
- ULONG rc;
-
video_canvas_t *c = GetCanvas(hwnd);
if (!c)
@@ -1081,19 +1083,6 @@
log_message(vidlog, "Debug - fbuf read y: %d + %d > %d, c->height=%d", ys, h, bufh, c->height);
h = bufh-ys;
}
- if (xs<0)
- {
- log_message(vidlog, "Debug - fbuf read x: %d < 0", xs);
- w += xs;
- xs = 0;
- }
- if (ys<0)
- {
- log_message(vidlog, "Debug - fbuf read y: %d < 0", ys);
- h += ys;
- ys = 0;
-
- }
if (xi+w > c->width)
{
log_message(vidlog, "Debug - scr write x x%d: %d + %d > %d", dsx, xi, w, c->width);
@@ -1104,18 +1093,6 @@
log_message(vidlog, "Debug - scr write y x%d: %d + %d > %d", dsy, yi, h, c->height);
h = c->height-yi;
}
- if (xi<0)
- {
- log_message(vidlog, "Debug - scr write x: %d < 0", xi);
- w += xi;
- xi = 0;
- }
- if (yi<0)
- {
- log_message(vidlog, "Debug - scr write y: %d < 0", yi);
- h += yi;
- yi = 0;
- }
#ifndef DIRECT_ACCESS
//
@@ -1351,6 +1328,7 @@
return FALSE;
}
+#ifdef HAVE_MOUSE
static void DisplayPopupMenu(HWND hwnd, POINTS *pts)
{
const video_canvas_t *c = GetCanvas(hwnd);
@@ -1358,6 +1336,7 @@
WinPopupMenu(hwnd, hwnd, c->hwndPopupMenu, pts->x, pts->y, 0,
PU_MOUSEBUTTON2DOWN|PU_HCONSTRAIN|PU_VCONSTRAIN);
}
+#endif
MRESULT EXPENTRY CanvasWinProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
{
@@ -1551,7 +1530,7 @@
// WM_UPDATEFRAME also hides the loaded popup menu
// the size is also corrected
//
- set_menu((void*)menu, (void*)c->hwndClient);
+ set_menu(menu, (void*)c->hwndClient);
}
/*
void InitStatusBar(video_canvas_t *c)
@@ -1945,7 +1924,6 @@
// dive_alloc/free and video_canvas_refresh
//
SWP swp;
- ULONG rc;
UINT wold = c->width;
UINT hold = c->height;
Modified: branches/marco/ports/vice/src/arch/os2/vsidui.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/vsidui.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/os2/vsidui.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -32,6 +32,10 @@
#include <stdlib.h>
+#ifdef WATCOM_COMPILE
+#include <process.h>
+#endif
+
#include "dialogs.h"
#include "dlg-vsid.h"
#include "dlg-emulator.h" // hwndVsidEmulator
Modified: branches/marco/ports/vice/src/arch/unix/gui/vsidui.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/gui/vsidui.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/unix/gui/vsidui.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -54,9 +54,13 @@
#include "vsiduiunix.h"
extern struct ui_menu_entry_s sid_submenu[];
+
+/* FIXME: sid menus need to be handled differently, but still need to
+ figure out the right way. */
+
+#if 0
UI_MENU_DEFINE_RADIO(SidStereoAddressStart)
-#if 0
static ui_menu_entry_t set_sid_stereo_address_d4xx_submenu[] = {
{ "*$D420", (ui_callback_t)radio_SidStereoAddressStart,
(ui_callback_data_t)0xd420, NULL },
Modified: branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/unix/x11/xaw/x11video.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -114,13 +114,14 @@
/* Flag: Do we try to use the MIT shared memory extensions? */
static int try_mitshm;
+#ifdef HAVE_XVIDEO
static unsigned int fourcc = 0;
static char *fourcc_s = NULL;
static double aspect_ratio;
static char *aspect_ratio_s = NULL;
+#endif
-
static int set_use_xsync(int val, void *param)
{
_video_use_xsync = val;
@@ -133,6 +134,7 @@
return 0;
}
+#ifdef HAVE_XVIDEO
static int set_fourcc(const char *val, void *param)
{
if (util_string_set(&fourcc_s, val))
@@ -171,6 +173,7 @@
return 0;
}
+#endif
/* Video-related resources. */
static const resource_string_t resources_string[] = {
@@ -205,8 +208,10 @@
void video_arch_resources_shutdown(void)
{
+#ifdef HAVE_XVIDEO
lib_free(aspect_ratio_s);
lib_free(fourcc_s);
+#endif
}
/* ------------------------------------------------------------------------- */
Modified: branches/marco/ports/vice/src/arch/win32/intl.c
===================================================================
--- branches/marco/ports/vice/src/arch/win32/intl.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/win32/intl.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -2962,7 +2962,7 @@
static void intl_text_init(void)
{
-int i, j;
+unsigned int i, j;
char temp_buffer[4098 * sizeof(TCHAR)];
/* for (i = 0; i < countof(language_table); i++) {
@@ -3017,7 +3017,7 @@
static void intl_text_free(void)
{
- int i,j;
+ unsigned int i,j;
for (i = 0; i < countof(language_table); i++)
{
@@ -3039,7 +3039,7 @@
char *intl_translate_text(int en_resource)
{
- int i;
+ unsigned int i;
for (i = 0; i < countof(intl_translate_text_table); i++)
{
@@ -3059,7 +3059,8 @@
char *intl_translate_text_new(int en_resource)
{
char *text;
-int i, j, k;
+unsigned int i;
+int j, k;
char temp_buffer[4098 * sizeof(TCHAR)];
HRSRC hRes;
HGLOBAL hGlob;
@@ -3134,7 +3135,7 @@
int intl_translate_res(int en_resource)
{
- int i;
+ unsigned int i;
if (!strcmp(current_language,"en"))
return en_resource;
Modified: branches/marco/ports/vice/src/arch/win32/ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/win32/ui.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/win32/ui.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -486,7 +486,7 @@
static void update_menus(HWND hwnd)
{
HMENU menu = GetMenu(hwnd);
- int i, j;
+ unsigned int i, j;
int value;
int result;
const char *lang;
Modified: branches/marco/ports/vice/src/arch/win32/watcom/c64.tgt
===================================================================
--- branches/marco/ports/vice/src/arch/win32/watcom/c64.tgt 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/win32/watcom/c64.tgt 2008-05-22 06:42:12 UTC (rev 18796)
@@ -68,7 +68,7 @@
17
WString
99
-$(%watcom)\h;$(%watcom)\h\nt;.;..;..\..\..;..\..\..\sid;..\..\..\vicii;..\..\..\drive;..\..\..\tape
+.;..;..\..\..;..\..\..\sid;..\..\..\vicii;..\..\..\drive;..\..\..\tape;$(%watcom)\h;$(%watcom)\h\nt
0
18
WVList
Modified: branches/marco/ports/vice/src/arch/win32/watcom/monitor.tgt
===================================================================
--- branches/marco/ports/vice/src/arch/win32/watcom/monitor.tgt 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/win32/watcom/monitor.tgt 2008-05-22 06:42:12 UTC (rev 18796)
@@ -68,7 +68,7 @@
17
WString
90
-$(%watcom)\h;$(%watcom)\h\nt;.;..;..\..\..;..\..\..\monitor;..\..\..\vdrive;..\..\..\drive
+.;..;..\..\..;..\..\..\monitor;..\..\..\vdrive;..\..\..\drive;$(%watcom)\h;$(%watcom)\h\nt
0
18
WVList
Modified: branches/marco/ports/vice/src/arch/win32/watcom/plus4.tgt
===================================================================
--- branches/marco/ports/vice/src/arch/win32/watcom/plus4.tgt 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/win32/watcom/plus4.tgt 2008-05-22 06:42:12 UTC (rev 18796)
@@ -68,7 +68,7 @@
17
WString
100
-$(%watcom)\h;$(%watcom)\h\nt;.;..;..\..\..;..\..\..\drive;..\..\..\tape;..\..\..\sid;..\..\..\raster
+.;..;..\..\..;..\..\..\drive;..\..\..\tape;..\..\..\sid;..\..\..\raster;$(%watcom)\h;$(%watcom)\h\nt
0
18
WVList
Modified: branches/marco/ports/vice/src/arch/win32/watcom/vic20.tgt
===================================================================
--- branches/marco/ports/vice/src/arch/win32/watcom/vic20.tgt 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/arch/win32/watcom/vic20.tgt 2008-05-22 06:42:12 UTC (rev 18796)
@@ -68,7 +68,7 @@
17
WString
100
-$(%watcom)\h;$(%watcom)\h\nt;.;..;..\..\..;..\..\..\raster;..\..\..\sid;..\..\..\drive;..\..\..\tape
+.;..;..\..\..;..\..\..\raster;..\..\..\sid;..\..\..\drive;..\..\..\tape;$(%watcom)\h;$(%watcom)\h\nt
0
18
WVList
Modified: branches/marco/ports/vice/src/c64/c64io.c
===================================================================
--- branches/marco/ports/vice/src/c64/c64io.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/c64/c64io.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -408,12 +408,12 @@
io_source_counter++;
}
if (georam_enabled && addr >= 0xdf80) {
- return georam_reg_read((WORD)(addr & 1));
+ return_value = georam_reg_read((WORD)(addr & 1));
io_source_check(io_source_counter);
io_source_counter++;
}
if (mmc64_enabled && addr >= 0xdf10 && addr <= 0xdf13) {
- return mmc64_io2_read((WORD)(addr));
+ return_value = mmc64_io2_read((WORD)(addr));
io_source_check(io_source_counter);
io_source_counter++;
}
Modified: branches/marco/ports/vice/src/c64/cart/c64cart.c
===================================================================
--- branches/marco/ports/vice/src/c64/cart/c64cart.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/c64/cart/c64cart.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -46,6 +46,7 @@
#include "lib.h"
#include "maincpu.h"
#include "mem.h"
+#include "monitor.h"
#include "resources.h"
#include "retroreplay.h"
#include "stb.h"
@@ -281,6 +282,11 @@
int cartridge_cmdline_options_init(void)
{
+ mon_cart_cmd.cartridge_attach_image = cartridge_attach_image;
+ mon_cart_cmd.cartridge_detach_image = cartridge_detach_image;
+ mon_cart_cmd.cartridge_trigger_freeze = cartridge_trigger_freeze;
+ mon_cart_cmd.cartridge_trigger_freeze_nmi_only = cartridge_trigger_freeze_nmi_only;
+
if (ide64_cmdline_options_init() < 0)
return -1;
Modified: branches/marco/ports/vice/src/c64/mmc64.c
===================================================================
--- branches/marco/ports/vice/src/c64/mmc64.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/c64/mmc64.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -959,8 +959,8 @@
if (mmc64_image_filename==NULL)
{
mmc64_cardpresent=MMC_CARDPRS;
+ mmc64_reset();
return 0;
- mmc64_reset();
}
mmc64_image_file=fopen(mmc64_image_filename,"rb+");
Modified: branches/marco/ports/vice/src/cartconv.c
===================================================================
--- branches/marco/ports/vice/src/cartconv.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/cartconv.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -37,6 +37,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#if defined(WATCOM_COMPILE) && defined(HAVE_IO_H)
+#include <io.h>
+#endif
#define GENERIC_CRT 0
#define ACTION_REPLAY_CRT 1
Modified: branches/marco/ports/vice/src/crtc/crtc.c
===================================================================
--- branches/marco/ports/vice/src/crtc/crtc.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/crtc/crtc.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -168,7 +168,7 @@
/*--------------------------------------------------------------------*/
/* reset the screen pointer at the beginning of the screen */
-static void inline crtc_reset_screen_ptr(void)
+static inline void crtc_reset_screen_ptr(void)
{
if (!crtc.initialized)
return;
@@ -203,7 +203,7 @@
}
/* update the chargen pointer when external switch has changed */
-static void inline crtc_update_chargen_rel(void)
+static inline void crtc_update_chargen_rel(void)
{
if (!crtc.initialized)
return;
@@ -214,7 +214,7 @@
}
/* update disp_char after writing to register 1 */
-static void inline crtc_update_disp_char(void)
+static inline void crtc_update_disp_char(void)
{
if (!crtc.initialized)
return;
Modified: branches/marco/ports/vice/src/drive/rotation.c
===================================================================
--- branches/marco/ports/vice/src/drive/rotation.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/drive/rotation.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -157,10 +157,12 @@
rotation[dnr].finish_byte = 1;
}
+#if 0
inline static unsigned int head_next2_offset(drive_t *dptr)
{
return (dptr->GCR_head_offset + 2) % dptr->GCR_current_track_size;
}
+#endif
inline static unsigned int head_next_offset(drive_t *dptr)
{
@@ -178,6 +180,7 @@
? dptr->GCR_head_offset - 1 : dptr->GCR_current_track_size - 1;
}
+#if 0
inline static unsigned int head_previous2_offset(drive_t *dptr)
{
return (dptr->GCR_head_offset + dptr->GCR_current_track_size - 2)
@@ -188,6 +191,7 @@
{
return dptr->GCR_track_start_ptr[head_next2_offset(dptr)];
}
+#endif
inline static BYTE peek_next(drive_t *dptr)
{
@@ -204,10 +208,12 @@
return dptr->GCR_track_start_ptr[head_previous_offset(dptr)];
}
+#if 0
inline static BYTE peek_previous2(drive_t *dptr)
{
return dptr->GCR_track_start_ptr[head_previous2_offset(dptr)];
}
+#endif
inline static void data_write(drive_t *dptr)
{
Modified: branches/marco/ports/vice/src/joystick.c
===================================================================
--- branches/marco/ports/vice/src/joystick.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/joystick.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -68,7 +68,9 @@
static CLOCK joystick_delay;
+#ifdef COMMON_KBD
static int joykeys[3][9];
+#endif
static void joystick_latch_matrix(CLOCK offset)
{
Modified: branches/marco/ports/vice/src/monitor/mon_command.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_command.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/monitor/mon_command.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -57,6 +57,12 @@
"If bankname is given set the current bank in the memspace to the given\n"
"bank." },
+ { "backtrace", "bt",
+ NULL,
+ "Print JSR call chain (most recent call first). Stack offset\n"
+ "relative to SP+1 is printed in parentheses. This is a best guess\n"
+ "only." },
+
{ "cpu", "",
"<type>",
"Specify the type of CPU currently used (6502/z80)." },
@@ -91,6 +97,10 @@
"Assign respective registers. With no parameters, display register\n"
"values." },
+ { "reset", "",
+ "[<type>]",
+ "Reset the machine or drive. Type: 0 = soft, 1 = hard, 8-11 = drive." },
+
{ "return", "ret",
NULL,
"Continues execution and returns to the monitor just before the next\n"
@@ -325,6 +335,10 @@
"Perform a disk command on the currently attached disk image on drive 8.\n"
"The specified disk command is sent to the drive's channel #15." },
+ { "attach", "",
+ "<filename> <device>",
+ "Attach file to device. (device 32 = cart)" },
+
{ "bload", "bl",
"\"<filename>\" <device> <address>",
"Load the specified file into memory at the specified address.\n"
@@ -350,6 +364,14 @@
"<directory>",
"Change the working directory." },
+ { "detach", "",
+ "<device>",
+ "Detach file from device. (device 32 = cart)" },
+
+ { "dir", "ls",
+ "[<directory>]",
+ "Display the directory contents." },
+
{ "load", "l",
"\"<filename>\" <device> [<address>]",
"Load the specified file into memory at the specified address. Set BASIC\n"
@@ -358,6 +380,10 @@
"specified.\n"
"If device is 0, the file is read from the file system." },
+ { "pwd", "",
+ NULL,
+ "Show current working directory." },
+
{ "save", "s",
"\"<filename>\" <device> <address1> <address2>",
"Save the memory from address1 to address2 to the specified file.\n"
@@ -370,6 +396,10 @@
"<number>",
"Display the specified number in decimal, hex, octal and binary." },
+ { "cartfreeze", "",
+ NULL,
+ "Use cartridge freeze." },
+
{ "help", "?",
"[<command>]",
"If no argument is given, prints out a list of all available commands\n"
@@ -393,10 +423,29 @@
"After this command, all commands entered are written to the specified\n"
"file until the STOP command is entered." },
+ { "resourceget", "resget",
+ "\"<resource>\"",
+ "Displays the value on the resource." },
+
+ { "resourceset", "resset",
+ "\"<resource>\" \"<value>\"",
+ "Sets the value of the resource." },
+
{ "stop", "",
NULL,
"Stop recording commands. See `record'." },
+ { "screenshot", "scrsh",
+ "\"<filename>\" [<format>]",
+ "Take a screenshot. Format is:\n"
+ "default = BMP, 1 = PCX, 2 = PNG, 3 = GIF, 4 = IFF." },
+
+ { "tapectrl", "",
+ "<command>",
+ "Control the datasette. Valid commands:\n"
+ "0 = stop, 1 = start, 2 = forward, 3 = rewind, 4 = record,\n"
+ "5 = reset, 6 = reset counter." },
+
/*
{ "]", "",
NULL,
Modified: branches/marco/ports/vice/src/monitor/mon_file.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_file.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/monitor/mon_file.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -33,10 +33,12 @@
#include "archdep.h"
#include "attach.h"
+#include "cartridge.h"
#include "mem.h"
#include "montypes.h"
#include "mon_file.h"
#include "mon_util.h"
+#include "tape.h"
#include "uimon.h"
#include "vdrive-iec.h"
#include "vdrive.h"
@@ -278,3 +280,67 @@
filename, addr_location(start_addr));
}
+void mon_attach(const char *filename, int device)
+{
+ switch(device) {
+ case 1:
+#ifdef C64DTV
+ mon_out("Unimplemented.\n");
+#else
+ if(tape_image_attach(device,filename)) {
+ mon_out("Failed.\n");
+ }
+#endif
+ break;
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ if(file_system_attach_disk(device,filename)) {
+ mon_out("Failed.\n");
+ }
+ break;
+ case 32:
+ if(mon_cart_cmd.cartridge_attach_image != NULL) {
+ if((mon_cart_cmd.cartridge_attach_image)(CARTRIDGE_CRT,filename)) {
+ mon_out("Failed.\n");
+ }
+ } else {
+ mon_out("Unsupported.\n");
+ }
+ break;
+ default:
+ mon_out("Unknown device %i.\n",device);
+ break;
+ }
+}
+
+void mon_detach(int device)
+{
+ switch(device) {
+ case 1:
+#ifdef C64DTV
+ mon_out("Unimplemented.\n");
+#else
+ tape_image_detach(device);
+#endif
+ break;
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ file_system_detach_disk(device);
+ break;
+ case 32:
+ if(mon_cart_cmd.cartridge_detach_image != NULL) {
+ (mon_cart_cmd.cartridge_detach_image)();
+ } else {
+ mon_out("Unsupported.\n");
+ }
+ break;
+ default:
+ mon_out("Unknown device %i.\n",device);
+ break;
+ }
+}
+
Modified: branches/marco/ports/vice/src/monitor/mon_file.h
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_file.h 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/monitor/mon_file.h 2008-05-22 06:42:12 UTC (rev 18796)
@@ -37,5 +37,8 @@
extern void mon_file_verify(const char *filename, int device,
MON_ADDR start_addr);
+extern void mon_attach(const char *filename, int unit);
+extern void mon_detach(int unit);
+
#endif
Modified: branches/marco/ports/vice/src/monitor/mon_lex.c
===================================================================
--- branches/marco/ports/vice/src/monitor/mon_lex.c 2008-05-21 21:07:49 UTC (rev 18795)
+++ branches/marco/ports/vice/src/monitor/mon_lex.c 2008-05-22 06:42:12 UTC (rev 18796)
@@ -363,8 +363,8 @@
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 157
-#define YY_END_OF_BUFFER 158
+#define YY_NUM_RULES 169
+#define YY_END_OF_BUFFER 170
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -372,164 +372,179 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_acclist[873] =
+static yyconst flex_int16_t yy_acclist[955] =
{ 0,
- 85, 148, 85, 148, 85, 85, 85, 85, 70, 85,
- 70, 85, 85, 85, 85, 148, 85, 148, 85, 148,
- 85, 148, 85, 148, 85, 148, 85, 148, 85, 148,
- 85, 88, 85, 88, 84, 85, 84, 85, 158, 156,
- 157, 85, 157, 86, 156, 157, 68, 156, 157, 156,
- 157, 156, 157, 156, 157, 156, 157, 154, 156, 157,
- 156, 157, 148, 150, 152, 156, 157, 145, 148, 150,
- 152, 156, 157, 150, 152, 156, 157, 150, 152, 156,
- 157, 61, 156, 157, 153, 156, 157, 152, 156, 157,
- 77, 152, 156, 157, 152, 156, 157, 75, 152, 156,
+ 96, 159, 96, 159, 96, 96, 96, 96, 81, 96,
+ 81, 96, 96, 96, 96, 159, 96, 159, 96, 159,
+ 96, 159, 96, 159, 96, 159, 96, 159, 96, 159,
+ 96, 99, 96, 99, 95, 96, 95, 96, 170, 168,
+ 169, 96, 169, 97, 168, 169, 79, 168, 169, 168,
+ 169, 168, 169, 168, 169, 168, 169, 166, 168, 169,
+ 168, 169, 159, 161, 164, 168, 169, 156, 159, 161,
+ 164, 168, 169, 161, 164, 168, 169, 161, 164, 168,
+ 169, 72, 168, 169, 165, 168, 169, 164, 168, 169,
+ 88, 164, 168, 169, 164, 168, 169, 86, 164, 168,
- 157, 76, 156, 157, 78, 156, 157, 156, 157, 156,
- 157, 78, 156, 157, 156, 157, 156, 157, 156, 157,
- 2, 156, 157, 27, 156, 157, 3, 156, 157, 60,
- 156, 157, 4, 60, 156, 157, 60, 156, 157, 14,
- 60, 156, 157, 17, 60, 156, 157, 60, 156, 157,
- 25, 60, 156, 157, 26, 60, 156, 157, 28, 60,
- 156, 157, 29, 60, 156, 157, 60, 156, 157, 34,
- 60, 156, 157, 36, 60, 156, 157, 40, 60, 156,
- 157, 42, 60, 156, 157, 60, 156, 157, 46, 60,
- 156, 157, 48, 60, 156, 157, 38, 60, 156, 157,
+ 169, 87, 168, 169, 89, 168, 169, 168, 169, 168,
+ 169, 168, 169, 89, 168, 169, 168, 169, 168, 169,
+ 168, 169, 168, 169, 2, 168, 169, 32, 168, 169,
+ 3, 168, 169, 71, 168, 169, 4, 71, 168, 169,
+ 71, 168, 169, 17, 71, 168, 169, 21, 71, 168,
+ 169, 71, 168, 169, 30, 71, 168, 169, 31, 71,
+ 168, 169, 33, 71, 168, 169, 34, 71, 168, 169,
+ 71, 168, 169, 39, 71, 168, 169, 41, 71, 168,
+ 169, 45, 71, 168, 169, 47, 71, 168, 169, 71,
+ 168, 169, 52, 71, 168, 169, 57, 71, 168, 169,
- 60, 156, 157, 58, 60, 156, 157, 24, 60, 156,
- 157, 60, 156, 157, 53, 60, 156, 157, 1, 156,
- 157, 70, 156, 157, 70, 85, 157, 69, 156, 157,
- 70, 154, 156, 157, 70, 153, 156, 157, 89, 156,
- 157, 89, 154, 156, 157, 89, 153, 156, 157, 142,
- 156, 157, 140, 156, 157, 141, 156, 157, 156, 157,
- 145, 148, 150, 152, 156, 157, 150, 152, 156, 157,
- 143, 156, 157, 152, 156, 157,16515, 132, 152, 156,
- 157, 133, 152, 156, 157, 134, 152, 156, 157, 135,
- 152, 156, 157, 152, 156, 157, 156, 157, 136, 156,
+ 43, 71, 168, 169, 71, 168, 169, 69, 71, 168,
+ 169, 29, 71, 168, 169, 71, 168, 169, 63, 71,
+ 168, 169, 1, 168, 169, 81, 168, 169, 81, 96,
+ 169, 80, 168, 169, 81, 166, 168, 169, 81, 165,
+ 168, 169, 100, 168, 169, 100, 166, 168, 169, 100,
+ 165, 168, 169, 153, 168, 169, 151, 168, 169, 152,
+ 168, 169, 168, 169, 156, 159, 161, 164, 168, 169,
+ 161, 164, 168, 169, 154, 168, 169, 164, 168, 169,
+ 16526, 143, 164, 168, 169, 144, 164, 168, 169, 145,
+ 164, 168, 169, 146, 164, 168, 169, 164, 168, 169,
- 157, 156, 157, 137, 156, 157, 138, 156, 157, 139,
- 156, 157, 152, 156, 157,16515, 132, 152, 156, 157,
- 134, 152, 156, 157, 136, 156, 157, 156, 157, 156,
- 157, 156, 157, 108, 156, 157, 109, 156, 157, 156,
- 157, 98, 156, 157, 153, 156, 157, 99, 156, 157,
- 156, 157, 90, 152, 156, 157, 156, 157, 156, 157,
- 91, 156, 157, 92, 156, 157, 156, 157, 88, 156,
- 157, 88, 156, 157, 88, 156, 157, 88, 156, 157,
- 88, 156, 157, 84, 156, 157, 85, 151, 146, 147,
- 149, 71, 73, 74, 72, 130, 129, 130, 148, 150,
+ 168, 169, 147, 168, 169, 168, 169, 148, 168, 169,
+ 149, 168, 169, 150, 168, 169, 164, 168, 169,16526,
+ 143, 164, 168, 169, 145, 164, 168, 169, 147, 168,
+ 169, 168, 169, 149, 168, 169, 168, 169, 168, 169,
+ 119, 168, 169, 120, 168, 169, 168, 169, 109, 168,
+ 169, 165, 168, 169, 110, 168, 169, 168, 169, 101,
+ 164, 168, 169, 168, 169, 168, 169, 102, 168, 169,
+ 103, 168, 169, 102, 168, 169, 168, 169, 99, 168,
+ 169, 99, 168, 169, 99, 168, 169, 99, 168, 169,
+ 99, 168, 169, 95, 168, 169, 96, 163, 157, 158,
- 152, 150, 152, 152, 145, 148, 150, 152, 145, 148,
- 150, 152, 80, 81, 79, 67, 62, 60, 60, 5,
- 60, 60, 7, 60, 8, 60, 10, 60, 11, 60,
- 12, 60, 60, 60, 60, 60, 19, 60, 60, 60,
- 60, 60, 60, 60, 60, 60, 30, 60, 32, 60,
- 60, 35, 60, 60, 37, 60, 60, 60, 39, 60,
- 60, 41, 60, 60, 60, 60, 60, 60, 60, 50,
- 60, 60, 60, 60, 49, 60, 60, 55, 60, 56,
- 60, 60, 60, 70, 70, 85, 89, 145, 148, 150,
- 152, 8323, 128, 152, 118, 128, 152, 128, 119, 128,
+ 160, 82, 84, 85, 83, 141, 140, 141, 159, 161,
+ 164, 161, 164, 164, 156, 159, 161, 164, 156, 159,
+ 161, 164, 91, 92, 90, 162, 78, 73, 71, 71,
+ 5, 71, 71, 71, 8, 71, 9, 71, 11, 71,
+ 12, 71, 13, 71, 71, 15, 71, 71, 71, 71,
+ 71, 23, 71, 71, 71, 71, 71, 71, 71, 71,
+ 71, 35, 71, 37, 71, 71, 40, 71, 71, 20,
+ 71, 42, 71, 71, 71, 44, 71, 71, 46, 71,
+ 71, 71, 71, 71, 71, 71, 71, 59, 71, 71,
+ 71, 71, 58, 71, 71, 71, 66, 71, 67, 71,
- 152, 120, 128, 152, 121, 128, 122, 128, 125, 128,
- 122, 128, 125, 128, 96, 101, 103, 104, 105, 97,
- 95, 100, 102, 93, 94, 155, 88, 88, 88, 84,
- 130, 129, 130, 148, 150, 152, 150, 152, 152, 145,
- 148, 150, 152, 82, 83, 63, 87, 60, 60, 60,
- 60, 60, 60, 60, 16, 60, 18, 60, 20, 60,
- 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
- 60, 36, 60, 60, 60, 60, 60, 60, 44, 60,
- 45, 60, 60, 47, 60, 60, 60, 52, 60, 51,
- 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+ 71, 71, 81, 81, 96, 100, 156, 159, 161, 164,
+ 8334, 139, 164, 129, 139, 164, 139, 130, 139, 164,
+ 131, 139, 164, 132, 139, 133, 139, 136, 139, 139,
+ 162, 133, 139, 136, 139, 107, 112, 114, 115, 116,
+ 108, 106, 111, 113, 104, 105, 167, 99, 99, 99,
+ 95, 141, 140, 141, 159, 161, 164, 161, 164, 164,
+ 156, 159, 161, 164, 93, 94, 74, 98, 71, 71,
+ 71, 71, 71, 71, 71, 71, 71, 71, 19, 71,
+ 22, 71, 71, 24, 71, 71, 71, 71, 71, 71,
+ 71, 71, 71, 71, 71, 71, 41, 71, 71, 71,
- 128, 152, 128, 123, 128, 124, 128, 126, 128, 127,
- 128, 106, 107, 148, 150, 152, 150, 152, 152, 145,
- 148, 150, 152, 65, 60, 6, 60, 60, 60, 60,
- 60, 60, 60, 15, 60, 60, 60, 60, 22, 60,
- 60, 24, 60, 25, 60, 26, 60, 27, 60, 28,
- 60, 60, 60, 34, 60, 60, 60, 38, 60, 40,
- 60, 60, 60, 43, 60, 60, 60, 60, 60, 48,
- 60, 60, 60, 60, 53, 60, 54, 60, 60, 60,
- 60, 60, 60, 128, 152, 128, 148, 150, 152, 150,
- 152, 152, 145, 148, 150, 152, 66, 60, 7, 60,
+ 71, 71, 48, 71, 71, 50, 71, 51, 71, 71,
+ 71, 56, 71, 71, 71, 62, 71, 61, 71, 71,
+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 139,
+ 164, 139, 134, 139, 135, 139, 137, 139, 138, 139,
+ 117, 118, 159, 161, 164, 161, 164, 164, 156, 159,
+ 161, 164, 76, 71, 71, 71, 7, 71, 71, 71,
+ 71, 71, 71, 71, 71, 18, 71, 71, 71, 71,
+ 71, 27, 71, 71, 29, 71, 30, 71, 31, 71,
+ 32, 71, 33, 71, 71, 71, 39, 71, 71, 71,
+ 43, 71, 45, 71, 71, 71, 49, 71, 71, 71,
- 60, 9, 60, 10, 60, 60, 60, 60, 60, 60,
- 60, 60, 60, 60, 60, 60, 60, 60, 60, 42,
- 60, 44, 60, 60, 60, 60, 60, 60, 60, 60,
- 55, 60, 60, 56, 60, 58, 60, 60, 114, 148,
- 150, 152, 150, 152, 152, 145, 148, 150, 152, 64,
- 60, 60, 60, 60, 60, 18, 60, 20, 60, 60,
- 17, 60, 23, 60, 31, 60, 33, 60, 60, 60,
- 60, 60, 45, 60, 60, 47, 60, 60, 50, 60,
- 60, 57, 60, 60, 110, 117, 115, 148, 150, 152,
- 150, 152, 152, 145, 148, 150, 152, 60, 60, 60,
+ 71, 71, 71, 71, 71, 71, 57, 71, 71, 71,
+ 71, 71, 63, 71, 64, 71, 71, 71, 71, 71,
+ 71, 71, 139, 164, 139, 159, 161, 164, 161, 164,
+ 164, 156, 159, 161, 164, 77, 71, 71, 71, 8,
+ 71, 71, 10, 71, 11, 71, 71, 71, 71, 71,
+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+ 71, 71, 47, 71, 50, 71, 71, 71, 53, 71,
+ 71, 71, 71, 71, 71, 71, 60, 71, 71, 71,
+ 71, 66, 71, 71, 67, 71, 69, 71, 71, 125,
+ 159, 161, 164, 161, 164, 164, 156, 159, 161, 164,
- 13, 60, 14, 60, 60, 60, 21, 60, 60, 60,
- 60, 60, 60, 60, 59, 60, 116, 144, 148, 150,
- 152, 144, 150, 152, 144, 152, 144, 145, 148, 150,
- 152, 60, 60, 60, 60, 60, 60, 60, 60, 60,
- 60, 113, 148, 150, 152, 150, 152, 152, 145, 148,
- 150, 152, 60, 60, 15, 60, 60, 60, 46, 60,
- 60, 60, 112, 111, 8, 60, 60, 60, 60, 60,
- 60, 60
+ 75, 71, 6, 71, 71, 71, 71, 71, 71, 71,
+ 22, 71, 25, 71, 24, 71, 71, 21, 71, 28,
+ 71, 36, 71, 38, 71, 71, 71, 71, 71, 51,
+ 71, 71, 54, 71, 71, 55, 71, 56, 71, 71,
+ 59, 71, 71, 71, 68, 71, 71, 121, 128, 126,
+ 159, 161, 164, 161, 164, 164, 156, 159, 161, 164,
+ 71, 71, 71, 71, 71, 16, 71, 17, 71, 71,
+ 71, 26, 71, 71, 71, 71, 71, 71, 71, 71,
+ 71, 71, 70, 71, 127, 155, 159, 161, 164, 155,
+ 161, 164, 155, 164, 155, 156, 159, 161, 164, 71,
+
+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+ 71, 71, 71, 65, 71, 124, 159, 161, 164, 161,
+ 164, 164, 156, 159, 161, 164, 71, 71, 71, 18,
+ 71, 71, 71, 52, 71, 71, 71, 71, 71, 71,
+ 123, 122, 9, 71, 71, 14, 71, 71, 71, 71,
+ 71, 71, 71, 71
} ;
-static yyconst flex_int16_t yy_accept[504] =
+static yyconst flex_int16_t yy_accept[568] =
{ 0,
1, 3, 5, 6, 7, 8, 9, 11, 13, 14,
15, 17, 19, 21, 23, 25, 27, 29, 31, 33,
35, 37, 39, 40, 42, 44, 47, 50, 52, 54,
56, 58, 61, 63, 68, 74, 78, 82, 85, 88,
- 91, 95, 98, 102, 105, 108, 110, 112, 115, 117,
- 119, 121, 124, 127, 130, 133, 137, 140, 144, 148,
- 151, 155, 159, 163, 167, 170, 174, 178, 182, 186,
- 189, 193, 197, 201, 204, 208, 212, 215, 219, 222,
- 225, 228, 231, 235, 239, 242, 246, 250, 253, 256,
- 259, 261, 267, 271, 274, 278, 282, 286, 290, 294,
+ 91, 95, 98, 102, 105, 108, 110, 112, 114, 117,
+ 119, 121, 123, 125, 128, 131, 134, 137, 141, 144,
+ 148, 152, 155, 159, 163, 167, 171, 174, 178, 182,
+ 186, 190, 193, 197, 201, 205, 208, 212, 216, 219,
+ 223, 226, 229, 232, 235, 239, 243, 246, 250, 254,
+ 257, 260, 263, 265, 271, 275, 278, 282, 286, 290,
- 297, 299, 302, 304, 307, 310, 313, 317, 321, 325,
- 328, 330, 332, 334, 337, 340, 342, 345, 348, 351,
- 353, 357, 359, 361, 364, 367, 369, 372, 375, 378,
- 381, 384, 387, 388, 389, 390, 391, 392, 393, 394,
- 395, 396, 397, 399, 402, 404, 405, 409, 413, 414,
- 415, 416, 417, 417, 417, 418, 418, 418, 418, 419,
- 420, 422, 423, 425, 427, 429, 431, 433, 434, 435,
- 436, 437, 439, 440, 441, 442, 443, 444, 445, 446,
- 447, 449, 451, 452, 454, 455, 457, 458, 459, 461,
- 462, 464, 465, 466, 467, 468, 469, 470, 472, 473,
+ 294, 298, 301, 303, 306, 308, 311, 314, 317, 321,
+ 325, 329, 332, 334, 337, 339, 341, 344, 347, 349,
+ 352, 355, 358, 360, 364, 366, 368, 371, 374, 377,
+ 379, 382, 385, 388, 391, 394, 397, 398, 399, 400,
+ 401, 402, 403, 404, 405, 406, 407, 409, 412, 414,
+ 415, 419, 423, 424, 425, 426, 427, 428, 428, 428,
+ 429, 429, 429, 429, 430, 431, 433, 434, 435, 437,
+ 439, 441, 443, 445, 446, 448, 449, 450, 451, 452,
+ 454, 455, 456, 457, 458, 459, 460, 461, 462, 464,
+ 466, 467, 469, 470, 472, 474, 475, 476, 478, 479,
- 474, 475, 477, 478, 480, 482, 483, 484, 485, 487,
- 488, 492, 492, 493, 495, 498, 499, 502, 505, 507,
- 509, 511, 513, 515, 516, 517, 518, 518, 518, 519,
- 520, 521, 522, 523, 524, 525, 526, 527, 528, 529,
- 530, 531, 532, 534, 537, 539, 540, 544, 545, 546,
- 546, 547, 547, 547, 548, 549, 550, 551, 552, 553,
- 554, 555, 557, 559, 561, 562, 563, 564, 565, 566,
- 567, 568, 569, 570, 571, 572, 574, 575, 576, 577,
- 578, 579, 581, 583, 584, 586, 587, 588, 590, 592,
- 593, 594, 595, 596, 597, 598, 599, 600, 601, 601,
+ 481, 482, 483, 484, 485, 486, 487, 488, 490, 491,
+ 492, 493, 495, 496, 497, 499, 501, 502, 503, 504,
+ 506, 507, 511, 511, 512, 514, 517, 518, 521, 524,
+ 526, 528, 530, 532, 534, 536, 537, 538, 539, 539,
+ 539, 540, 541, 542, 543, 544, 545, 546, 547, 548,
+ 549, 550, 551, 552, 553, 555, 558, 560, 561, 565,
+ 566, 567, 567, 568, 568, 568, 569, 570, 571, 572,
+ 573, 574, 575, 576, 577, 578, 579, 581, 583, 584,
+ 586, 587, 588, 589, 590, 591, 592, 593, 594, 595,
+ 596, 597, 599, 600, 601, 602, 603, 605, 606, 608,
- 603, 604, 606, 608, 610, 612, 613, 614, 617, 619,
- 620, 624, 625, 625, 625, 626, 628, 629, 630, 631,
- 632, 633, 634, 636, 637, 638, 639, 641, 642, 644,
- 646, 648, 650, 652, 653, 654, 656, 657, 658, 660,
- 662, 663, 664, 666, 667, 668, 669, 670, 672, 673,
- 674, 675, 677, 679, 680, 681, 682, 683, 684, 684,
- 684, 684, 686, 687, 690, 692, 693, 697, 698, 698,
- 699, 701, 702, 704, 706, 707, 708, 709, 710, 711,
- 712, 713, 714, 715, 716, 717, 718, 719, 720, 722,
- 724, 725, 726, 727, 728, 729, 730, 731, 733, 734,
+ 610, 611, 612, 614, 615, 616, 618, 620, 621, 622,
+ 623, 624, 625, 626, 627, 628, 629, 630, 630, 632,
+ 633, 635, 637, 639, 641, 642, 643, 646, 648, 649,
+ 653, 654, 654, 654, 655, 656, 657, 659, 660, 661,
+ 662, 663, 664, 665, 666, 668, 669, 670, 671, 672,
+ 674, 675, 677, 679, 681, 683, 685, 686, 687, 689,
+ 690, 691, 693, 695, 696, 697, 699, 700, 701, 702,
+ 703, 704, 705, 706, 707, 709, 710, 711, 712, 713,
+ 715, 717, 718, 719, 720, 721, 722, 723, 723, 723,
+ 723, 725, 726, 729, 731, 732, 736, 737, 737, 738,
- 736, 738, 739, 739, 740, 740, 740, 740, 743, 745,
- 746, 750, 751, 752, 753, 754, 755, 756, 758, 760,
- 761, 763, 765, 767, 769, 770, 771, 772, 773, 775,
- 776, 778, 779, 781, 782, 784, 785, 785, 785, 786,
- 787, 788, 788, 791, 793, 794, 798, 799, 800, 801,
- 803, 805, 806, 807, 809, 810, 811, 812, 813, 814,
- 815, 817, 817, 817, 818, 822, 825, 827, 832, 833,
- 834, 835, 836, 837, 838, 839, 840, 841, 842, 843,
- 843, 846, 848, 849, 853, 854, 855, 857, 858, 859,
- 861, 862, 863, 864, 865, 867, 868, 869, 870, 871,
+ 739, 740, 742, 743, 745, 747, 748, 749, 750, 751,
+ 752, 753, 754, 755, 756, 757, 758, 759, 760, 761,
+ 762, 763, 765, 767, 768, 769, 771, 772, 773, 774,
+ 775, 776, 777, 779, 780, 781, 782, 784, 785, 787,
+ 789, 790, 790, 791, 791, 791, 791, 794, 796, 797,
+ 801, 802, 803, 805, 806, 807, 808, 809, 810, 811,
+ 813, 815, 817, 818, 820, 822, 824, 826, 827, 828,
+ 829, 830, 832, 833, 835, 836, 838, 840, 841, 843,
+ 844, 845, 847, 848, 848, 848, 849, 850, 851, 851,
+ 854, 856, 857, 861, 862, 863, 864, 865, 866, 868,
- 872, 873, 873
+ 870, 871, 872, 874, 875, 876, 877, 878, 879, 880,
+ 881, 882, 883, 885, 885, 885, 886, 890, 893, 895,
+ 900, 901, 902, 903, 904, 905, 906, 907, 908, 909,
+ 910, 911, 912, 913, 914, 916, 917, 917, 920, 922,
+ 923, 927, 928, 929, 930, 932, 933, 934, 936, 937,
+ 938, 939, 940, 941, 942, 943, 945, 946, 948, 949,
+ 950, 951, 952, 953, 954, 955, 955
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -575,288 +590,311 @@
11, 11, 11, 11, 11, 11, 11, 11, 1, 1
} ;
-static yyconst flex_int16_t yy_base[537] =
+static yyconst flex_int16_t yy_base[601] =
{ 0,
- 0, 0, 65, 0, 127, 0, 196, 201, 209, 214,
- 238, 0, 304, 0, 369, 0, 417, 463, 530, 0,
- 600, 670, 1304, 1305, 75, 1305, 1305, 0, 72, 74,
- 88, 1305, 393, 304, 327, 213, 1282, 1305, 1305, 0,
- 0, 1281, 0, 1305, 1305, 1252, 1243, 69, 1237, 1241,
- 0, 1305, 1305, 1305, 0, 154, 310, 179, 305, 20,
- 1245, 1239, 158, 261, 1247, 45, 321, 1246, 280, 1230,
- 76, 372, 1232, 1235, 1246, 0, 1222, 0, 1305, 0,
- 119, 1305, 0, 0, 0, 0, 0, 1305, 1305, 1305,
- 439, 314, 1267, 1305, 739, 460, 465, 468, 492, 614,
+ 0, 0, 65, 0, 131, 0, 200, 205, 213, 218,
+ 242, 0, 308, 0, 372, 0, 418, 464, 531, 0,
+ 601, 671, 1387, 1388, 75, 1388, 1388, 0, 72, 74,
+ 308, 1388, 415, 331, 355, 107, 1365, 1388, 1388, 0,
+ 0, 1364, 0, 1388, 1388, 1343, 1334, 1325, 52, 1319,
+ 1323, 1313, 0, 1388, 1388, 1388, 0, 171, 383, 310,
+ 345, 20, 1326, 1320, 57, 178, 1328, 177, 404, 1327,
+ 409, 1311, 192, 426, 55, 1317, 1328, 0, 1304, 0,
+ 1388, 0, 100, 1388, 0, 0, 0, 0, 0, 1388,
+ 1388, 1388, 486, 113, 1349, 1388, 740, 615, 628, 631,
- 0, 1250, 295, 0, 0, 0, 186, 684, 698, 1232,
- 296, 1261, 415, 1305, 1305, 401, 1260, 1259, 1258, 1212,
- 0, 302, 302, 1305, 1305, 0, 0, 360, 1259, 1258,
- 1257, 0, 220, 0, 374, 437, 492, 1305, 1305, 1305,
- 1305, 0, 453, 498, 612, 0, 620, 1256, 1305, 1305,
- 1305, 1305, 1232, 1226, 1305, 1217, 1223, 1266, 0, 1224,
- 0, 1214, 1212, 1220, 1223, 0, 0, 340, 1203, 353,
- 1204, 0, 1209, 1219, 1210, 1207, 1198, 1205, 1202, 1201,
- 0, 0, 1189, 0, 1211, 0, 1199, 1189, 0, 1186,
- 0, 1207, 1198, 1197, 1201, 593, 1183, 1186, 1179, 419,
+ 635, 685, 0, 1332, 171, 0, 1327, 0, 177, 699,
+ 705, 1313, 249, 1300, 1341, 324, 1388, 1388, 487, 1340,
+ 1339, 1338, 1292, 0, 193, 278, 1319, 1388, 1293, 0,
+ 0, 305, 1337, 1336, 1335, 0, 354, 0, 328, 378,
+ 500, 1388, 1388, 1388, 1388, 0, 405, 624, 694, 0,
+ 450, 1334, 1388, 1388, 1388, 1388, 1388, 1310, 1304, 1388,
+ 1295, 1301, 1344, 0, 1302, 0, 1286, 320, 1290, 1298,
+ 1301, 0, 0, 1284, 0, 308, 1280, 419, 323, 0,
+ 1287, 1297, 1288, 1285, 1276, 1283, 1280, 1279, 0, 0,
+ 1267, 0, 1289, 0, 0, 1277, 1267, 0, 1264, 0,
- 1197, 0, 380, 1199, 325, 1180, 1194, 0, 348, 0,
- 1219, 642, 1305, 804, 850, 648, 0, 0, 694, 716,
- 809, 839, 856, 1305, 1305, 1305, 1209, 1199, 1305, 1305,
- 1305, 1305, 1305, 1305, 1305, 1305, 0, 0, 1216, 1215,
- 0, 0, 461, 640, 705, 0, 510, 1305, 1305, 1188,
- 1305, 1174, 1183, 1226, 1188, 1177, 339, 1185, 1164, 464,
- 1180, 0, 1178, 1173, 1180, 1165, 1177, 1159, 1166, 1162,
- 1160, 1155, 1159, 1170, 1167, 431, 1165, 1150, 1144, 1154,
- 1147, 1156, 1150, 1154, 1142, 1156, 1155, 0, 0, 1137,
- 1153, 1142, 1141, 1152, 1134, 1144, 1149, 1146, 1182, 907,
+ 1285, 1276, 1280, 1274, 1278, 604, 1260, 1263, 1256, 64,
+ 1274, 0, 281, 1262, 1275, 360, 1256, 1270, 0, 445,
+ 0, 1295, 713, 1388, 805, 851, 731, 0, 0, 810,
+ 827, 856, 885, 890, 907, 1388, 1388, 1388, 1285, 1275,
+ 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 0, 0,
+ 1292, 1291, 0, 0, 408, 705, 711, 0, 473, 1388,
+ 1388, 1264, 1388, 1250, 1259, 1302, 1264, 1262, 1252, 1251,
+ 407, 1259, 1238, 1239, 351, 1253, 0, 1251, 1254, 1245,
+ 1252, 1237, 1249, 1231, 1238, 1234, 1232, 1227, 1231, 1242,
+ 1239, 436, 1237, 1222, 1216, 1226, 0, 1219, 1228, 1222,
- 745, 884, 901, 912, 929, 1305, 1305, 798, 822, 0,
- 632, 1305, 1144, 1137, 1136, 0, 1142, 1135, 1131, 1131,
- 1130, 1124, 1115, 1104, 1115, 645, 0, 1103, 0, 0,
- 0, 0, 0, 1096, 1088, 1104, 1094, 1086, 0, 0,
- 1098, 1080, 0, 1072, 1077, 1075, 1073, 1086, 1079, 1083,
- 1076, 0, 0, 1076, 1066, 1052, 1050, 1044, 0, 1061,
- 691, 1061, 1059, 845, 941, 0, 710, 1305, 1010, 1002,
- 0, 1000, 0, 0, 981, 976, 973, 984, 902, 890,
- 873, 874, 867, 860, 854, 862, 832, 847, 0, 0,
- 842, 825, 821, 817, 791, 791, 765, 0, 772, 0,
+ 1226, 871, 1214, 1228, 439, 0, 0, 1210, 1226, 1215,
+ 1214, 1223, 1224, 1206, 1216, 1221, 1218, 1254, 958, 918,
+ 929, 935, 952, 963, 1388, 1388, 746, 799, 0, 493,
+ 1388, 1216, 1209, 1208, 1215, 1198, 0, 1212, 1205, 1204,
+ 1208, 1206, 1210, 1209, 1200, 1189, 1204, 1203, 453, 0,
+ 1194, 0, 0, 0, 0, 0, 1187, 1183, 1202, 1193,
+ 1185, 0, 0, 1197, 1179, 0, 1174, 1179, 1177, 1175,
+ 1188, 1172, 1186, 1173, 1189, 1183, 1179, 1186, 1179, 0,
+ 0, 1181, 1178, 1167, 1163, 1161, 1161, 0, 1191, 641,
+ 1200, 1195, 896, 976, 0, 794, 1388, 1147, 1150, 1138,
- 0, 756, 0, 801, 768, 752, 0, 946, 951, 0,
- 793, 1305, 709, 149, 705, 702, 696, 704, 0, 697,
- 0, 0, 0, 0, 700, 678, 685, 683, 0, 670,
- 0, 672, 0, 671, 0, 654, 691, 0, 1305, 1305,
- 1305, 685, 956, 961, 0, 868, 641, 614, 601, 0,
- 0, 597, 599, 0, 606, 580, 587, 574, 588, 575,
- 0, 605, 0, 1305, 966, 971, 0, 896, 469, 476,
- 454, 443, 453, 403, 402, 385, 396, 374, 0, 400,
- 925, 0, 0, 976, 358, 342, 0, 355, 344, 0,
- 284, 263, 1305, 1305, 0, 264, 184, 166, 54, 40,
+ 1125, 0, 1140, 0, 0, 1122, 1125, 1120, 1114, 1127,
+ 1123, 1123, 1113, 1104, 1116, 1115, 1113, 1105, 1100, 1079,
+ 1083, 0, 0, 1066, 1041, 0, 1039, 1036, 1022, 1025,
+ 1021, 1018, 0, 1019, 1004, 923, 0, 926, 0, 0,
+ 910, 0, 955, 946, 945, 0, 981, 992, 0, 823,
+ 1388, 912, 0, 906, 350, 895, 895, 892, 868, 875,
+ 0, 0, 869, 0, 0, 0, 0...
[truncated message content] |
|
From: <cnv...@us...> - 2008-05-21 21:07:46
|
Revision: 18795
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18795&view=rev
Author: cnvogelg
Date: 2008-05-21 14:07:49 -0700 (Wed, 21 May 2008)
Log Message:
-----------
chris/cocoa-port: fixed Mac OS X keyboard mapping. added separate symbolic mappings for german and us keyboards.
Modified Paths:
--------------
branches/chris/cocoa-port/vice/data/C64/Makefile.am
branches/chris/cocoa-port/vice/data/C64/osx_pos.vkm
branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib
branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/keyedobjects.nib
branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/kbd.h
Added Paths:
-----------
branches/chris/cocoa-port/vice/data/C64/osx_sym_de.vkm
branches/chris/cocoa-port/vice/data/C64/osx_sym_us.vkm
Removed Paths:
-------------
branches/chris/cocoa-port/vice/data/C64/osx_sym.vkm
Modified: branches/chris/cocoa-port/vice/data/C64/Makefile.am
===================================================================
--- branches/chris/cocoa-port/vice/data/C64/Makefile.am 2008-05-19 20:09:20 UTC (rev 18794)
+++ branches/chris/cocoa-port/vice/data/C64/Makefile.am 2008-05-21 21:07:49 UTC (rev 18795)
@@ -21,7 +21,8 @@
os2.vkm \
os2_sym.vkm \
osx_pos.vkm \
- osx_sym.vkm \
+ osx_sym_de.vkm \
+ osx_sym_us.vkm \
pc64.vpl \
ROdflt.vkm \
vice.vpl \
Modified: branches/chris/cocoa-port/vice/data/C64/osx_pos.vkm
===================================================================
--- branches/chris/cocoa-port/vice/data/C64/osx_pos.vkm 2008-05-19 20:09:20 UTC (rev 18794)
+++ branches/chris/cocoa-port/vice/data/C64/osx_pos.vkm 2008-05-21 21:07:49 UTC (rev 18795)
@@ -21,15 +21,8 @@
# 2 left shift
# 4 right shift
# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
!CLEAR
!LSHIFT 1 7
@@ -42,7 +35,7 @@
3 2 5 8 /* F -> F */
4 3 5 8 /* H -> H */
5 3 2 8 /* G -> G */
-6 3 1 8 /* Y -> Y */
+6 1 4 8 /* Y -> Z */
7 2 7 8 /* X -> X */
8 2 4 8 /* C -> C */
9 3 7 8 /* V -> V */
@@ -52,7 +45,8 @@
13 1 1 8 /* W -> W */
14 1 6 8 /* E -> E */
15 2 1 8 /* R -> R */
-16 1 4 8 /* Z -> Z */
+
+16 3 1 8 /* Z -> Y */
17 2 6 8 /* T -> T */
18 7 0 8 /* 1 -> 1 */
19 7 3 8 /* 2 -> 2 */
@@ -68,6 +62,7 @@
29 4 3 8 /* 0 -> 0 */
30 6 1 8 /* Plus -> * */
31 4 6 8 /* O -> O */
+
32 3 6 8 /* U -> U */
33 5 6 8 /* "U -> @ */
34 4 1 8 /* I -> I */
@@ -84,23 +79,24 @@
45 4 7 8 /* N -> N */
46 4 4 8 /* M -> M */
47 5 4 8 /* . -> . */
+
48 7 2 8 /* TAB -> Ctrl */
49 7 4 8 /* Space -> Space */
-#50 -1 -1 0 /* <> -> (no key) */
+50 7 5 8 /* < > -> CBM */
51 0 0 8 /* Backspace -> Del */
52 6 4 4 /* Enter -> Right Shift */
53 7 7 8 /* ESC -> Run/Stop */
-
-#54 -1 -1 0 /* (no key) */
-#55 -1 -1 0 /* (no key) */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
56 1 7 2 /* Left Shift -> Left Shift */
#57 -1 -1 0 /* (no key) */
-58 7 5 8 /* Option -> CBM */
+58 7 5 8 /* Left Alt -> CBM */
59 7 2 8 /* Left Ctrl -> CBM */
-#60 -1 -1 0 /* (no key) */
-#61 -1 -1 0 /* (no key) */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
#62 -1 -1 0 /* (no key) */
-#63 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
#64 -1 -1 0 /* (no key) */
#65 -1 -1 0 /* Numpad . -> (no key) */
#66 -1 -1 0 /* &&& -> (no key) */
@@ -116,6 +112,7 @@
#76 -1 -1 0 /* Numpad Enter -> (no key) */
#77 -1 -1 0 /* &&& -> (no key) */
#78 -1 -1 0 /* Numpad - -> (no key) */
+
#82 -1 -1 0 /* Numpad 0 -> (no key) */
#83 -1 -1 0 /* Numpad 1 -> (no key) */
#84 -1 -1 0 /* Numpad 2 -> (no key) */
@@ -126,53 +123,25 @@
#89 -1 -1 0 /* Numpad 7 -> (no key) */
#91 -1 -1 0 /* Numpad 8 -> (no key) */
#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
96 0 6 8 /* F5 -> F5 */
97 0 6 1 /* F6 -> F6 */
98 0 3 8 /* F7 -> F7 */
99 0 5 8 /* F3 -> F3 */
100 0 3 1 /* F8 -> F8 */
-#101 -1 -1 0 /* F9 -> (no key) */
-#103 -1 -1 0 /* F11 -> (no key) */
-#109 -1 -1 0 /* F10 -> (no key) */
-#111 -1 -1 0 /* F12 -> (no key) */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
115 6 3 8 /* Home -> CLR/HOME */
116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
118 0 5 1 /* F4 -> F4 */
120 0 4 1 /* F2 -> F2 */
121 6 0 8 /* PgDown -> Pound */
122 0 4 8 /* F1 -> F1 */
123 0 2 1 /* Left -> CRSR LEFT */
-124 0 2 8 /* Right -> CRSR RIGHT */
-125 0 7 8 /* Down -> CRSR DOWN */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
126 0 7 1 /* Up -> CRSR UP */
-
-#
-# Joystick 1
-#
-#KP_0 -1 0
-#KP_1 -1 1
-#KP_2 -1 2
-#KP_3 -1 3
-#KP_4 -1 4
-#KP_5 -1 5
-#KP_6 -1 6
-#KP_7 -1 7
-#KP_8 -1 8
-#KP_9 -1 9
-
-#
-# Joystick 2
-#
-#w -2 7
-#e -2 8
-#r -2 9
-#s -2 4
-#d -2 5
-#f -2 6
-#x -2 1
-#c -2 2
-#v -2 3
-#space -2 0
-
-# Restore key mappings
-117 -3 0 /* Del -> RESTORE */
Deleted: branches/chris/cocoa-port/vice/data/C64/osx_sym.vkm
===================================================================
--- branches/chris/cocoa-port/vice/data/C64/osx_sym.vkm 2008-05-19 20:09:20 UTC (rev 18794)
+++ branches/chris/cocoa-port/vice/data/C64/osx_sym.vkm 2008-05-21 21:07:49 UTC (rev 18795)
@@ -1,183 +0,0 @@
-# VICE keyboard mapping file
-#
-# A Keyboard map is read in as patch to the current map.
-#
-# File format:
-# - comment lines start with '#'
-# - keyword lines start with '!keyword'
-# - normal line has 'keysym/scancode row column shiftflag'
-#
-# Keywords and their lines are:
-# '!CLEAR' clear whole table
-# '!INCLUDE filename' read file as mapping file
-# '!LSHIFT row col' left shift keyboard row/column
-# '!RSHIFT row col' right shift keyboard row/column
-# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
-# '!UNDEF keysym' remove keysym from table
-#
-# Shiftflag can have the values:
-# 0 key is not shifted for this keysym
-# 1 key is shifted for this keysym
-# 2 left shift
-# 4 right shift
-# 8 key can be shifted or not with this keysym
-#
-# Negative row values:
-# 'keysym -1 n' joystick #1, direction n
-# 'keysym -2 n' joystick #2, direction n
-# 'keysym -3 0' first RESTORE key
-# 'keysym -3 1' second RESTORE key
-# 'keysym -4 0' 40/80 column key
-# 'keysym -4 1' CAPS (ASCII/DIN) key
-#
-
-!CLEAR
-!LSHIFT 1 7
-!RSHIFT 6 4
-!VSHIFT RSHIFT
-
-0 1 2 8 /* A -> A */
-1 1 5 8 /* S -> S */
-2 2 2 8 /* D -> D */
-3 2 5 8 /* F -> F */
-4 3 5 8 /* H -> H */
-5 3 2 8 /* G -> G */
-6 3 1 8 /* Y -> Y */
-7 2 7 8 /* X -> X */
-8 2 4 8 /* C -> C */
-9 3 7 8 /* V -> V */
-10 7 1 8 /* ^ -> Left Arrow */
-11 3 4 8 /* B -> B */
-12 7 6 8 /* Q -> Q */
-13 1 1 8 /* W -> W */
-14 1 6 8 /* E -> E */
-15 2 1 8 /* R -> R */
-16 1 4 8 /* Z -> Z */
-17 2 6 8 /* T -> T */
-18 7 0 8 /* 1 -> 1 */
-19 7 3 8 /* 2 -> 2 */
-20 1 0 8 /* 3 -> 3 */
-21 1 3 8 /* 4 -> 4 */
-22 2 3 8 /* 6 -> 6 */
-23 2 0 8 /* 5 -> 5 */
-24 5 3 8 /* ` -> Minus */
-25 4 0 8 /* 9 -> 9 */
-26 3 0 8 /* 7 -> 7 */
-27 5 0 8 /* \ss -> Plus */
-28 3 3 8 /* 8 -> 8 */
-29 4 3 8 /* 0 -> 0 */
-30 6 1 8 /* Plus -> * */
-31 4 6 8 /* O -> O */
-32 3 6 8 /* U -> U */
-33 5 6 8 /* "U -> @ */
-34 4 1 8 /* I -> I */
-35 5 1 8 /* P -> P */
-36 0 1 8 /* Return -> Return */
-37 5 2 8 /* L -> L */
-38 4 2 8 /* J -> J */
-39 6 2 8 /* "A -> ; */
-40 4 5 8 /* K -> K */
-41 5 5 8 /* "O -> : */
-42 6 5 8 /* Hash -> = */
-43 5 7 8 /* , -> , */
-44 6 7 8 /* Minus -> / */
-45 4 7 8 /* N -> N */
-46 4 4 8 /* M -> M */
-47 5 4 8 /* . -> . */
-48 7 2 8 /* TAB -> Ctrl */
-49 7 4 8 /* Space -> Space */
-#50 -1 -1 0 /* <> -> (no key) */
-51 0 0 8 /* Backspace -> Del */
-52 6 4 4 /* Enter -> Right Shift */
-53 7 7 8 /* ESC -> Run/Stop */
-
-#54 -1 -1 0 /* (no key) */
-#55 -1 -1 0 /* (no key) */
-56 1 7 2 /* Left Shift -> Left Shift */
-#57 -1 -1 0 /* (no key) */
-58 7 5 8 /* Option -> CBM */
-59 7 2 8 /* Left Ctrl -> CBM */
-#60 -1 -1 0 /* (no key) */
-#61 -1 -1 0 /* (no key) */
-#62 -1 -1 0 /* (no key) */
-#63 -1 -1 0 /* (no key) */
-#64 -1 -1 0 /* (no key) */
-#65 -1 -1 0 /* Numpad . -> (no key) */
-#66 -1 -1 0 /* &&& -> (no key) */
-#67 -1 -1 0 /* Numpad * -> (no key) */
-#68 -1 -1 0 /* (no key) */
-#69 -1 -1 0 /* Numpad + -> (no key) */
-#70 -1 -1 0 /* &&& -> (no key) */
-#71 -1 -1 0 /* Numpad Clear -> (no key) */
-#72 -1 -1 0 /* &&& -> (no key) */
-#73 -1 -1 0 /* &&& -> (no key) */
-#74 -1 -1 0 /* &&& -> (no key) */
-#75 -1 -1 0 /* Numpad / -> (no key) */
-#76 -1 -1 0 /* Numpad Enter -> (no key) */
-#77 -1 -1 0 /* &&& -> (no key) */
-#78 -1 -1 0 /* Numpad - -> (no key) */
-#82 -1 -1 0 /* Numpad 0 -> (no key) */
-#83 -1 -1 0 /* Numpad 1 -> (no key) */
-#84 -1 -1 0 /* Numpad 2 -> (no key) */
-#85 -1 -1 0 /* Numpad 3 -> (no key) */
-#86 -1 -1 0 /* Numpad 4 -> (no key) */
-#87 -1 -1 0 /* Numpad 5 -> (no key) */
-#88 -1 -1 0 /* Numpad 6 -> (no key) */
-#89 -1 -1 0 /* Numpad 7 -> (no key) */
-#91 -1 -1 0 /* Numpad 8 -> (no key) */
-#92 -1 -1 0 /* Numpad 9 -> (no key) */
-96 0 6 8 /* F5 -> F5 */
-97 0 6 1 /* F6 -> F6 */
-98 0 3 8 /* F7 -> F7 */
-99 0 5 8 /* F3 -> F3 */
-100 0 3 1 /* F8 -> F8 */
-#101 -1 -1 0 /* F9 -> (no key) */
-#103 -1 -1 0 /* F11 -> (no key) */
-#109 -1 -1 0 /* F10 -> (no key) */
-#111 -1 -1 0 /* F12 -> (no key) */
-115 6 3 8 /* Home -> CLR/HOME */
-116 6 6 8 /* PgUp -> Up Arrow */
-118 0 5 1 /* F4 -> F4 */
-120 0 4 1 /* F2 -> F2 */
-121 6 0 8 /* PgDown -> Pound */
-122 0 4 8 /* F1 -> F1 */
-123 0 2 1 /* Left -> CRSR LEFT */
-124 0 2 8 /* Right -> CRSR RIGHT */
-125 0 7 8 /* Down -> CRSR DOWN */
-126 0 7 1 /* Up -> CRSR UP */
-
-#
-# Joystick 1
-#
-#KP_0 -1 0
-#KP_1 -1 1
-#KP_2 -1 2
-#KP_3 -1 3
-#KP_4 -1 4
-#KP_5 -1 5
-#KP_6 -1 6
-#KP_7 -1 7
-#KP_8 -1 8
-#KP_9 -1 9
-
-123 -2 4 /* Left -> Joy2 LEFT */
-124 -2 6 /* Right -> Joy2 RIGHT */
-125 -2 2 /* Down -> Joy2 DOWN */
-126 -2 8 /* Up -> Joy2 UP */
-52 -2 0 /* Enter -> Joy2 BUTTON */
-#
-# Joystick 2
-#
-#w -2 7
-#e -2 8
-#r -2 9
-#s -2 4
-#d -2 5
-#f -2 6
-#x -2 1
-#c -2 2
-#v -2 3
-#space -2 0
-
-# Restore key mappings
-117 -3 0 /* Del -> RESTORE */
Copied: branches/chris/cocoa-port/vice/data/C64/osx_sym_de.vkm (from rev 18792, branches/chris/cocoa-port/vice/data/C64/osx_sym.vkm)
===================================================================
--- branches/chris/cocoa-port/vice/data/C64/osx_sym_de.vkm (rev 0)
+++ branches/chris/cocoa-port/vice/data/C64/osx_sym_de.vkm 2008-05-21 21:07:49 UTC (rev 18795)
@@ -0,0 +1,154 @@
+# VICE keyboard mapping file
+#
+# A Keyboard map is read in as patch to the current map.
+#
+# File format:
+# - comment lines start with '#'
+# - keyword lines start with '!keyword'
+# - normal line has 'keysym/scancode row column shiftflag'
+#
+# Keywords and their lines are:
+# '!CLEAR' clear whole table
+# '!INCLUDE filename' read file as mapping file
+# '!LSHIFT row col' left shift keyboard row/column
+# '!RSHIFT row col' right shift keyboard row/column
+# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
+# '!UNDEF keysym' remove keysym from table
+#
+# Shiftflag can have the values:
+# 0 key is not shifted for this keysym
+# 1 key is shifted for this keysym
+# 2 left shift
+# 4 right shift
+# 8 key can be shifted or not with this keysym
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
+
+!CLEAR
+!LSHIFT 1 7
+!RSHIFT 6 4
+!VSHIFT RSHIFT
+
+0 1 2 8 /* A -> A */
+1 1 5 8 /* S -> S */
+2 2 2 8 /* D -> D */
+3 2 5 8 /* F -> F */
+4 3 5 8 /* H -> H */
+5 3 2 8 /* G -> G */
+6 3 1 8 /* Y -> Y */
+7 2 7 8 /* X -> X */
+8 2 4 8 /* C -> C */
+9 3 7 8 /* V -> V */
+10 7 1 8 /* ^ -> Left Arrow */
+11 3 4 8 /* B -> B */
+12 7 6 8 /* Q -> Q */
+13 1 1 8 /* W -> W */
+14 1 6 8 /* E -> E */
+15 2 1 8 /* R -> R */
+
+16 1 4 8 /* Z -> Z */
+17 2 6 8 /* T -> T */
+18 7 0 8 /* 1 -> 1 */
+19 7 3 8 /* 2 -> 2 */
+20 1 0 0 /* 3 -> 3 */
+21 1 3 8 /* 4 -> 4 */
+22 2 3 8 /* 6 -> 6 */
+23 2 0 8 /* 5 -> 5 */
+24 3 0 1 /* ` -> ´ ! */
+25 4 0 8 /* 9 -> 9 */
+26 3 0 32 /* 7 -> 7 !! */
+26 6 7 16 /* 7 -> / !! */
+27 6 7 1 /* \ss -> ? ! */
+28 3 3 8 /* 8 -> 8 */
+29 4 3 32 /* 0 -> 0 !! */
+29 6 5 16 /* 0 -> 0 !! */
+30 5 0 32 /* Plus -> + !! */
+30 6 1 16 /* Plus -> * !! */
+31 4 6 8 /* O -> O */
+
+32 3 6 8 /* U -> U */
+#33 5 6 8 /* "U -> ! */
+34 4 1 8 /* I -> I */
+35 5 1 8 /* P -> P */
+36 0 1 8 /* Return -> Return */
+37 5 2 8 /* L -> L */
+38 4 2 8 /* J -> J */
+#39 6 2 8 /* "A -> ! */
+40 4 5 8 /* K -> K */
+#41 5 5 8 /* "O -> ! */
+42 1 0 33 /* Hash -> # !! */
+42 3 0 1 /* Hash -> ' !! */
+43 5 7 32 /* , -> , !! */
+43 6 2 16 /* , -> ; !! */
+44 5 3 0 /* Minus -> Minus ! */
+45 4 7 8 /* N -> N */
+46 4 4 8 /* M -> M */
+47 5 4 32 /* . -> . !! */
+47 5 5 16 /* . -> : !! */
+
+48 7 2 8 /* TAB -> Ctrl */
+49 7 4 8 /* Space -> Space */
+50 5 7 33 /* < > -> < !! */
+50 5 4 1 /* < > -> > !! */
+51 0 0 8 /* Backspace -> Del */
+52 6 4 4 /* Enter -> Right Shift */
+53 7 7 8 /* ESC -> Run/Stop */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
+56 1 7 2 /* Left Shift -> Left Shift */
+#57 -1 -1 0 /* (no key) */
+58 7 5 8 /* Left Alt -> CBM */
+59 7 2 8 /* Left Ctrl -> CBM */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
+#62 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
+#64 -1 -1 0 /* (no key) */
+#65 -1 -1 0 /* Numpad . -> (no key) */
+#66 -1 -1 0 /* &&& -> (no key) */
+#67 -1 -1 0 /* Numpad * -> (no key) */
+#68 -1 -1 0 /* (no key) */
+#69 -1 -1 0 /* Numpad + -> (no key) */
+#70 -1 -1 0 /* &&& -> (no key) */
+#71 -1 -1 0 /* Numpad Clear -> (no key) */
+#72 -1 -1 0 /* &&& -> (no key) */
+#73 -1 -1 0 /* &&& -> (no key) */
+#74 -1 -1 0 /* &&& -> (no key) */
+#75 -1 -1 0 /* Numpad / -> (no key) */
+#76 -1 -1 0 /* Numpad Enter -> (no key) */
+#77 -1 -1 0 /* &&& -> (no key) */
+#78 -1 -1 0 /* Numpad - -> (no key) */
+
+#82 -1 -1 0 /* Numpad 0 -> (no key) */
+#83 -1 -1 0 /* Numpad 1 -> (no key) */
+#84 -1 -1 0 /* Numpad 2 -> (no key) */
+#85 -1 -1 0 /* Numpad 3 -> (no key) */
+#86 -1 -1 0 /* Numpad 4 -> (no key) */
+#87 -1 -1 0 /* Numpad 5 -> (no key) */
+#88 -1 -1 0 /* Numpad 6 -> (no key) */
+#89 -1 -1 0 /* Numpad 7 -> (no key) */
+#91 -1 -1 0 /* Numpad 8 -> (no key) */
+#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
+96 0 6 8 /* F5 -> F5 */
+97 0 6 1 /* F6 -> F6 */
+98 0 3 8 /* F7 -> F7 */
+99 0 5 8 /* F3 -> F3 */
+100 0 3 1 /* F8 -> F8 */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
+115 6 3 8 /* Home -> CLR/HOME */
+116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
+118 0 5 1 /* F4 -> F4 */
+120 0 4 1 /* F2 -> F2 */
+121 6 0 8 /* PgDown -> Pound */
+122 0 4 8 /* F1 -> F1 */
+123 0 2 1 /* Left -> CRSR LEFT */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
+126 0 7 1 /* Up -> CRSR UP */
Added: branches/chris/cocoa-port/vice/data/C64/osx_sym_us.vkm
===================================================================
--- branches/chris/cocoa-port/vice/data/C64/osx_sym_us.vkm (rev 0)
+++ branches/chris/cocoa-port/vice/data/C64/osx_sym_us.vkm 2008-05-21 21:07:49 UTC (rev 18795)
@@ -0,0 +1,150 @@
+# VICE keyboard mapping file
+#
+# A Keyboard map is read in as patch to the current map.
+#
+# File format:
+# - comment lines start with '#'
+# - keyword lines start with '!keyword'
+# - normal line has 'keysym/scancode row column shiftflag'
+#
+# Keywords and their lines are:
+# '!CLEAR' clear whole table
+# '!INCLUDE filename' read file as mapping file
+# '!LSHIFT row col' left shift keyboard row/column
+# '!RSHIFT row col' right shift keyboard row/column
+# '!VSHIFT shiftkey' virtual shift key (RSHIFT or LSHIFT)
+# '!UNDEF keysym' remove keysym from table
+#
+# Shiftflag can have the values:
+# 0 key is not shifted for this keysym
+# 1 key is shifted for this keysym
+# 2 left shift
+# 4 right shift
+# 8 key can be shifted or not with this keysym
+# 16 deshift key for this keysym/scancode
+# 32 another definition for this keysym/scancode follows
+
+!CLEAR
+!LSHIFT 1 7
+!RSHIFT 6 4
+!VSHIFT RSHIFT
+
+0 1 2 8 /* A -> A */
+1 1 5 8 /* S -> S */
+2 2 2 8 /* D -> D */
+3 2 5 8 /* F -> F */
+4 3 5 8 /* H -> H */
+5 3 2 8 /* G -> G */
+6 1 4 8 /* Z -> Z */
+7 2 7 8 /* X -> X ! */
+8 2 4 8 /* C -> C */
+9 3 7 8 /* V -> V */
+10 7 1 8 /* ^ -> Left Arrow */
+11 3 4 8 /* B -> B */
+12 7 6 8 /* Q -> Q */
+13 1 1 8 /* W -> W */
+14 1 6 8 /* E -> E */
+15 2 1 8 /* R -> R */
+
+16 3 1 8 /* Y -> Y ! */
+17 2 6 8 /* T -> T */
+18 7 0 8 /* 1 -> 1 */
+19 7 3 8 /* 2 -> 2 */
+20 1 0 8 /* 3 -> 3 */
+21 1 3 8 /* 4 -> 4 */
+22 2 3 8 /* 6 -> 6 */
+23 2 0 8 /* 5 -> 5 */
+24 6 5 32 /* = -> = ! */
+24 5 0 0 /* = -> + ! */
+25 4 0 8 /* 9 -> 9 */
+26 3 0 8 /* 7 -> 7 */
+27 5 3 0 /* - -> - ! */
+28 3 3 8 /* 8 -> 8 */
+29 4 3 8 /* 0 -> 0 */
+30 6 2 1 /* ] -> ] ! */
+31 4 6 8 /* O -> O */
+
+32 3 6 8 /* U -> U */
+33 5 5 1 /* [ -> [ ! */
+34 4 1 8 /* I -> I */
+35 5 1 8 /* P -> P */
+36 0 1 8 /* Return -> Return */
+37 5 2 8 /* L -> L */
+38 4 2 8 /* J -> J */
+39 3 0 33 /* ' -> ' ! */
+39 7 3 1 /* " -> " ! */
+40 4 5 8 /* K -> K */
+41 6 2 32 /* ; -> ; ! */
+41 5 5 16 /* ; -> : ! */
+42 6 6 8 /* \ -> Up Arrow ! */
+43 5 7 8 /* , -> , */
+44 6 7 8 /* / -> / */
+45 4 7 8 /* N -> N */
+46 4 4 8 /* M -> M */
+47 5 4 8 /* . -> . */
+
+48 7 2 8 /* TAB -> Ctrl */
+49 7 4 8 /* Space -> Space */
+50 7 5 8 /* < > -> CBM */
+51 0 0 8 /* Backspace -> Del */
+52 6 4 4 /* Enter -> Right Shift */
+53 7 7 8 /* ESC -> Run/Stop */
+#54 -1 -1 0 /* Right CMD -> */
+#55 -1 -1 0 /* Left CMD -> */
+56 1 7 2 /* Left Shift -> Left Shift */
+#57 -1 -1 0 /* (no key) */
+58 7 5 8 /* Left Alt -> CBM */
+59 7 2 8 /* Left Ctrl -> CBM */
+60 6 4 4 /* Right Shift -> Right Shift */
+#61 -1 -1 0 /* Right Alt -> */
+#62 -1 -1 0 /* (no key) */
+#63 -1 -1 0 /* Fn -> */
+
+#64 -1 -1 0 /* (no key) */
+#65 -1 -1 0 /* Numpad . -> (no key) */
+#66 -1 -1 0 /* &&& -> (no key) */
+#67 -1 -1 0 /* Numpad * -> (no key) */
+#68 -1 -1 0 /* (no key) */
+#69 -1 -1 0 /* Numpad + -> (no key) */
+#70 -1 -1 0 /* &&& -> (no key) */
+#71 -1 -1 0 /* Numpad Clear -> (no key) */
+#72 -1 -1 0 /* &&& -> (no key) */
+#73 -1 -1 0 /* &&& -> (no key) */
+#74 -1 -1 0 /* &&& -> (no key) */
+#75 -1 -1 0 /* Numpad / -> (no key) */
+#76 -1 -1 0 /* Numpad Enter -> (no key) */
+#77 -1 -1 0 /* &&& -> (no key) */
+#78 -1 -1 0 /* Numpad - -> (no key) */
+
+#82 -1 -1 0 /* Numpad 0 -> (no key) */
+#83 -1 -1 0 /* Numpad 1 -> (no key) */
+#84 -1 -1 0 /* Numpad 2 -> (no key) */
+#85 -1 -1 0 /* Numpad 3 -> (no key) */
+#86 -1 -1 0 /* Numpad 4 -> (no key) */
+#87 -1 -1 0 /* Numpad 5 -> (no key) */
+#88 -1 -1 0 /* Numpad 6 -> (no key) */
+#89 -1 -1 0 /* Numpad 7 -> (no key) */
+#91 -1 -1 0 /* Numpad 8 -> (no key) */
+#92 -1 -1 0 /* Numpad 9 -> (no key) */
+
+96 0 6 8 /* F5 -> F5 */
+97 0 6 1 /* F6 -> F6 */
+98 0 3 8 /* F7 -> F7 */
+99 0 5 8 /* F3 -> F3 */
+100 0 3 1 /* F8 -> F8 */
+101 6 0 8 /* F9 -> Pound */
+103 6 3 8 /* F11 -> CLR/HOME */
+109 6 6 8 /* F10 -> Up Arrow */
+111 -3 0 /* F12 -> RESTORE */
+
+115 6 3 8 /* Home -> CLR/HOME */
+116 6 6 8 /* PgUp -> Up Arrow */
+117 0 0 8 /* Del -> Del */
+118 0 5 1 /* F4 -> F4 */
+120 0 4 1 /* F2 -> F2 */
+121 6 0 8 /* PgDown -> Pound */
+122 0 4 8 /* F1 -> F1 */
+123 0 2 1 /* Left -> CRSR LEFT */
+124 0 2 0 /* Right -> CRSR RIGHT */
+125 0 7 0 /* Down -> CRSR DOWN */
+126 0 7 1 /* Up -> CRSR UP */
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib 2008-05-19 20:09:20 UTC (rev 18794)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/info.nib 2008-05-21 21:07:49 UTC (rev 18795)
@@ -8,10 +8,10 @@
<integer>3</integer>
<key>IBOpenObjects</key>
<array>
- <integer>2</integer>
+ <integer>1</integer>
</array>
<key>IBSystem Version</key>
- <string>9B18</string>
+ <string>9C7010</string>
<key>targetFramework</key>
<string>IBCocoaFramework</string>
</dict>
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/Resources/English.lproj/KeyboardSettings.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/kbd.h
===================================================================
--- branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/kbd.h 2008-05-19 20:09:20 UTC (rev 18794)
+++ branches/chris/cocoa-port/vice/src/arch/unix/macosx/cocoa/kbd.h 2008-05-21 21:07:49 UTC (rev 18795)
@@ -33,8 +33,8 @@
extern signed long kbd_arch_keyname_to_keynum(char *keyname);
extern const char *kbd_arch_keynum_to_keyname(signed long keynum);
-#define KBD_C64_SYM_US "osx_sym.vkm"
-#define KBD_C64_SYM_DE "osx_sym.vkm"
+#define KBD_C64_SYM_US "osx_sym_us.vkm"
+#define KBD_C64_SYM_DE "osx_sym_de.vkm"
#define KBD_C64_POS "osx_pos.vkm"
#define KBD_C128_SYM "osx_sym.vkm"
#define KBD_C128_POS "osx_pos.vkm"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
19 messages has been excluded from this view by a project administrator.