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

Versatile Commodore Emulator

Brought to you by: blackystardust, gpz

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

You can subscribe to this list here.

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

Flat | Threaded

<< < 1 .. 1060 1061 1062 1063 1064 .. 1071 > >> (Page 1062 of 1071)

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

From: <st...@us...> - 2008-07-02 17:44:41

Revision: 18946
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18946&view=rev
Author:   strik
Date:     2008-07-02 10:44:39 -0700 (Wed, 02 Jul 2008)

Log Message:
-----------
2008-07-02  Spiro Trikaliotis  <spi...@gm...>

	* arch/win32/Makefile.am: Added new file _all.dsp.

	* c64/reu.c: The banking register has a shadow register, too.

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/win32/Makefile.am
    trunk/vice/src/c64/reu.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-02 14:48:04 UTC (rev 18945)
+++ trunk/vice/src/ChangeLog	2008-07-02 17:44:39 UTC (rev 18946)
@@ -1,3 +1,9 @@
+2008-07-02  Spiro Trikaliotis  <spi...@gm...>
+
+	* arch/win32/Makefile.am: Added new file _all.dsp.
+
+	* c64/reu.c: The banking register has a shadow register, too.
+
 2008-07-01  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.22

Modified: trunk/vice/src/arch/win32/Makefile.am
===================================================================
--- trunk/vice/src/arch/win32/Makefile.am	2008-07-02 14:48:04 UTC (rev 18945)
+++ trunk/vice/src/arch/win32/Makefile.am	2008-07-02 17:44:39 UTC (rev 18946)
@@ -307,6 +307,7 @@
 	watcom/xplus4main.c \
 	watcom/xvic.tgt \
 	watcom/xvicmain.c \
+	_all.dsp \
 	arch.dsp \
 	base.dsp \
 	c128.dsp \

Modified: trunk/vice/src/c64/reu.c
===================================================================
--- trunk/vice/src/c64/reu.c	2008-07-02 14:48:04 UTC (rev 18945)
+++ trunk/vice/src/c64/reu.c	2008-07-02 17:44:39 UTC (rev 18946)
@@ -187,6 +187,7 @@
 
     WORD base_computer_shadow;   /*!< shadow register of base_computer */
     WORD base_reu_shadow;        /*!< shadow register of base_reu */
+    BYTE bank_reu_shadow;        /*!< shadow register of bank_reu */
     WORD transfer_length_shadow; /*!< shadow register of transfer_length */
 };
 
@@ -199,7 +200,7 @@
     unsigned int special_wrap_around_1700;      /*!< address where the special 1700 wrap around occurs; if no 1700, the same avalue as wrap_around */
     unsigned int not_backedup_addresses;        /*!< beginning from this address up to wrap_around, there is no DRAM at all */
     unsigned int wrap_around_mask_when_storing; /*!< mask for the wrap around of REU address when putting result back in base_reu and bank_reu */
-    unsigned int reg_bank_unused;               /*!< the unused bits (stuck at 1) of REU_REG_RW_BANK; for original REU, it is REU_REG_RW_BANK_UNUSED */
+    BYTE         reg_bank_unused;               /*!< the unused bits (stuck at 1) of REU_REG_RW_BANK; for original REU, it is REU_REG_RW_BANK_UNUSED */
     BYTE         status_preset;                 /*!< preset value for the status (can be 0 or REU_REG_R_STATUS_256K_CHIPS) */
 };
 
@@ -486,7 +487,8 @@
     rec.transfer_length =
     rec.transfer_length_shadow = 0xffff;
 
-    rec.bank_reu = rec_options.reg_bank_unused;
+    rec.bank_reu = 
+    rec.bank_reu_shadow = rec_options.reg_bank_unused;
 
     rec.int_mask_reg = REU_REG_RW_INTERRUPT_UNUSED_MASK;
 
@@ -677,7 +679,8 @@
         break;
 
     case REU_REG_RW_BANK:
-        rec.bank_reu = byte & ~ rec_options.reg_bank_unused;
+        rec.bank_reu = 
+        rec.bank_reu_shadow = byte & ~ rec_options.reg_bank_unused;
         break;
 
     case REU_REG_RW_BLOCKLEN_LOW:
@@ -910,6 +913,7 @@
     else {
         rec.base_computer   = rec.base_computer_shadow;
         rec.base_reu        = rec.base_reu_shadow;
+        rec.bank_reu        = rec.bank_reu_shadow;
         rec.transfer_length = rec.transfer_length_shadow;
 
         DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Autoload.") );


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

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

From: <bla...@us...> - 2008-07-02 14:48:54

Revision: 18945
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18945&view=rev
Author:   blackystardust
Date:     2008-07-02 07:48:04 -0700 (Wed, 02 Jul 2008)

Log Message:
-----------
Added a GP2X-Howto.txt which explains how to cross-compile the GP2X port using DevkitGP2X.

Modified Paths:
--------------
    branches/marco/ports/vice/doc/Makefile.am

Added Paths:
-----------
    branches/marco/ports/vice/doc/GP2X-Howto.txt

Added: branches/marco/ports/vice/doc/GP2X-Howto.txt
===================================================================
--- branches/marco/ports/vice/doc/GP2X-Howto.txt	                        (rev 0)
+++ branches/marco/ports/vice/doc/GP2X-Howto.txt	2008-07-02 14:48:04 UTC (rev 18945)
@@ -0,0 +1,27 @@
+This document describes how to compile the GP2X port.
+
+
+First of all you will need to install DevkitGP2X, and make sure the 
+cross-toolchain binaries are in the PATH.
+
+After installing DevkitGP2X you will need to copy or make links for the 
+following files:
+
+arm-linux-ar     to arm-gp2x-linux-ar
+arm-linux-g++    to arm-gp2x-linux=g++
+arm-linux-gcc    to arm-gp2x-linux-gcc
+arm-linux-ranlib to arm-gp2x-linux-ranlib
+arm-linux-strip  to arm-gp2x-linux-strip
+
+After doing this you will be able to use the --host configure option for 
+VICE to have it build the GP2X port. In other words, you just use:
+
+./configure --host=arm-gp2x-linux
+
+And the configure script will try to find and use the correct 
+cross-toolchain (arm-gp2x-linux-*), and set the correct CFLAGS and LDFLAGS 
+for the GP2X port.
+
+After the compile is done you can use 'make bindist' to create a binary 
+distribution directory, or use 'make bindistzip' to create a binary 
+distribution zip archive.

Modified: branches/marco/ports/vice/doc/Makefile.am
===================================================================
--- branches/marco/ports/vice/doc/Makefile.am	2008-07-02 05:34:27 UTC (rev 18944)
+++ branches/marco/ports/vice/doc/Makefile.am	2008-07-02 14:48:04 UTC (rev 18945)
@@ -17,7 +17,8 @@
 	cartconv.txt \
 	iec-bus.txt \
 	mon.txt \
-	openGLsync-howto.txt
+	openGLsync-howto.txt \
+	GP2X-Howto.txt
 
 info_TEXINFOS = vice.texi
 


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

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

From: <bla...@us...> - 2008-07-02 05:34:20

Revision: 18944
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18944&view=rev
Author:   blackystardust
Date:     2008-07-01 22:34:27 -0700 (Tue, 01 Jul 2008)

Log Message:
-----------
Added a proper digital audio mixing routine and fixed the multiple audio-source mixing.

Modified Paths:
--------------
    branches/marco/ports/vice/src/c64/digimax.c
    branches/marco/ports/vice/src/pet/petsound.c
    branches/marco/ports/vice/src/plus4/ted-sound.c
    branches/marco/ports/vice/src/sound.h
    branches/marco/ports/vice/src/vic20/vic20sound.c

Modified: branches/marco/ports/vice/src/c64/digimax.c
===================================================================
--- branches/marco/ports/vice/src/c64/digimax.c	2008-07-01 23:35:17 UTC (rev 18943)
+++ branches/marco/ports/vice/src/c64/digimax.c	2008-07-02 05:34:27 UTC (rev 18944)
@@ -166,12 +166,18 @@
                                                    int interleave, int *delta_t)
 {
   int i;
+  SWORD ch1and2;
+  SWORD ch3and4;
+  SWORD channels;
 
   if (sid_sound_machine_cycle_based()==0 && digimax_enabled)
   {
     for (i=0; i<nr; i++)
     {
-      pbuf[i*interleave]+=(snd.voice0+snd.voice1+snd.voice2+snd.voice3)<<6;
+      ch1and2=sound_audio_mix(snd.voice0<<8,snd.voice1<<8);
+      ch3and4=sound_audio_mix(snd.voice2<<8,snd.voice3<<8);
+      channels=sound_audio_mix(ch1and2,ch3and4);
+      pbuf[i*interleave]=sound_audio_mix(pbuf[i*interleave],channels);
     }
   }
   return 0;

Modified: branches/marco/ports/vice/src/pet/petsound.c
===================================================================
--- branches/marco/ports/vice/src/pet/petsound.c	2008-07-01 23:35:17 UTC (rev 18943)
+++ branches/marco/ports/vice/src/pet/petsound.c	2008-07-02 05:34:27 UTC (rev 18944)
@@ -101,7 +101,7 @@
         else if (snd.manual)
             v = 20000;
 
-        pbuf[i * interleave] += v;
+        pbuf[i * interleave] = sound_audio_mix(pbuf[i * interleave],(SWORD)v);
         snd.b += snd.bs;
         while (snd.b >= 8.0)
             snd.b -= 8.0;

Modified: branches/marco/ports/vice/src/plus4/ted-sound.c
===================================================================
--- branches/marco/ports/vice/src/plus4/ted-sound.c	2008-07-01 23:35:17 UTC (rev 18943)
+++ branches/marco/ports/vice/src/plus4/ted-sound.c	2008-07-02 05:34:27 UTC (rev 18944)
@@ -96,9 +96,9 @@
 
     if (snd.digital) {
         for (i = 0; i < nr; i++) {
-            pbuf[i * interleave] += (SDWORD)(snd.volume *
+            pbuf[i * interleave] = sound_audio_mix(pbuf[i * interleave], (snd.volume *
                                    (snd.voice0_output_enabled
-                                   + snd.voice1_output_enabled));
+                                   + snd.voice1_output_enabled)));
         }
     } else {
         for (i = 0; i < nr; i++) {
@@ -176,7 +176,7 @@
                 && (!(snd.noise_shift_register & 1)))
                 volume += snd.volume;
 
-            pbuf[i * interleave] += volume;
+            pbuf[i * interleave] = sound_audio_mix(pbuf[i * interleave], volume);
         }
     }
     return 0;

Modified: branches/marco/ports/vice/src/sound.h
===================================================================
--- branches/marco/ports/vice/src/sound.h	2008-07-01 23:35:17 UTC (rev 18943)
+++ branches/marco/ports/vice/src/sound.h	2008-07-02 05:34:27 UTC (rev 18944)
@@ -85,6 +85,23 @@
     int need_attenuation;
 } sound_device_t;
 
+static inline SWORD sound_audio_mix(SWORD ch1, SWORD ch2)
+{
+  if (ch1 == 0)
+    return ch2;
+
+  if (ch2 == 0)
+    return ch1;
+
+  if ((ch1 > 0 && ch2 < 0) || (ch1 < 0 && ch2 >0))
+    return ch1+ch2;
+
+  if (ch1 > 0)
+    return (SWORD)((SDWORD)(ch1 + ch2) - (SDWORD)(ch1 * ch2 / 32768));
+
+  return (SWORD)-((SDWORD)(-(ch1) + -(ch2)) - (SDWORD)(-(ch1) * -(ch2) / 32768));
+}
+
 /* Sound adjustment types.  */
 #define SOUND_ADJUST_FLEXIBLE   0
 #define SOUND_ADJUST_ADJUSTING  1

Modified: branches/marco/ports/vice/src/vic20/vic20sound.c
===================================================================
--- branches/marco/ports/vice/src/vic20/vic20sound.c	2008-07-01 23:35:17 UTC (rev 18943)
+++ branches/marco/ports/vice/src/vic20/vic20sound.c	2008-07-02 05:34:27 UTC (rev 18944)
@@ -99,7 +99,7 @@
         int real_sample_counter;
 
         vicbuf = (((vic_sound_run(snd.cycles_per_sample) * snd.vol) / (snd.cycles_per_sample))<<9) - (snd.vol*0x800);
-        pbuf[i * interleave] += vicbuf;
+        pbuf[i * interleave] = sound_audio_mix(pbuf[i * interleave], vicbuf);
 
         if (vicbuf != 0 && sample_counter != -1)
             sample_counter = -1;
@@ -109,7 +109,7 @@
             real_sample_counter = sample_counter*44100/snd.speed;
             if (real_sample_counter < VIC20CLICK_LEN)
             {
-                pbuf[i * interleave] += (SWORD)vic20click[real_sample_counter]*sample_volume;
+                pbuf[i * interleave] = sound_audio_mix(pbuf[i * interleave], (SWORD)vic20click[real_sample_counter]*sample_volume);
                 sample_counter++;
             }
             else


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

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

From: <bla...@us...> - 2008-07-01 23:35:09

Revision: 18943
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18943&view=rev
Author:   blackystardust
Date:     2008-07-01 16:35:17 -0700 (Tue, 01 Jul 2008)

Log Message:
-----------
Updated to 1.22.22

Modified Paths:
--------------
    branches/marco/ports/vice/ChangeLog
    branches/marco/ports/vice/configure.in
    branches/marco/ports/vice/po/ChangeLog
    branches/marco/ports/vice/src/ChangeLog
    branches/marco/ports/vice/src/version.h

Modified: branches/marco/ports/vice/ChangeLog
===================================================================
--- branches/marco/ports/vice/ChangeLog	2008-07-01 19:07:22 UTC (rev 18942)
+++ branches/marco/ports/vice/ChangeLog	2008-07-01 23:35:17 UTC (rev 18943)
@@ -1,3 +1,14 @@
+2008-07-01  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.22
+
+2008-06-30  Marco van den Heuvel  <bla...@ya...>
+
+	* doc/html/plain/NEWS: Added mint and sol11 ports and corrected
+	a typo.
+
+	* doc/html/solaris.html: Added sol11 port.
+
 2008-06-29  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.21

Modified: branches/marco/ports/vice/configure.in
===================================================================
--- branches/marco/ports/vice/configure.in	2008-07-01 19:07:22 UTC (rev 18942)
+++ branches/marco/ports/vice/configure.in	2008-07-01 23:35:17 UTC (rev 18943)
@@ -9,7 +9,7 @@
 
 VICE_VERSION_MAJOR=1
 VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=21
+VICE_VERSION_BUILD=22
 
 AC_SUBST(VICE_VERSION_MAJOR)
 AC_SUBST(VICE_VERSION_MINOR)

Modified: branches/marco/ports/vice/po/ChangeLog
===================================================================
--- branches/marco/ports/vice/po/ChangeLog	2008-07-01 19:07:22 UTC (rev 18942)
+++ branches/marco/ports/vice/po/ChangeLog	2008-07-01 23:35:17 UTC (rev 18943)
@@ -1,3 +1,7 @@
+2008-06-30  Marco van den Heuvel  <bla...@ya...>
+
+	* nl.po: Updated.
+
 2008-06-19  Marco van den Heuvel  <bla...@ya...>
 
 	* nl.po: Updated.

Modified: branches/marco/ports/vice/src/ChangeLog
===================================================================
--- branches/marco/ports/vice/src/ChangeLog	2008-07-01 19:07:22 UTC (rev 18942)
+++ branches/marco/ports/vice/src/ChangeLog	2008-07-01 23:35:17 UTC (rev 18943)
@@ -1,3 +1,51 @@
+2008-07-01  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.22
+
+2008-06-30  Marco van den Heuvel  <bla...@ya...>
+
+	* arch/amigaos/intl.c, arch/win32/res.rc,
+	arch/win32/reside64.rc, arch/win32/resmouse.rc, translate.c:
+	Updated the Hungarian text.
+
+	* arch/unix/qnx6/make-bindist.sh,
+	arch/unix/sco_sol/make-bindist.sh,
+	arch/unix/skyos/make-bindist.sh: Improved.
+
+	* arch/unix/x11/gnome/x11ui.c: Corrected a typo.
+
+	* arch/win32/resc128.rc, arch/win32/resc64.rc,
+	arch/win32/rescbm2.rc, arch/win32/respet.rc,
+	arch/win32/resplus4.rc, arch/win32/resvic20.rc: Updated the
+	Hungarian text and extended the copy/paste text to the other
+	languages.
+
+	* arch/win32/uikeyboard.c: Fixed the shortcut text routine to
+	work for win9x/winnt4 too.
+
+	* c64/c64io.c, c64/georam.h: Fixed the reading of the GeoRAM
+	registers.
+
+	* c64/cart/c64cart.c: Fixed some text elements.
+
+	* c64/georam.c: Fixed the reading of the GeoRAM registers, and
+	added a comment block describing the GeoRAM in more detail.
+
+	* c64/ramcart.c: Fixed the reading of the RamCart registers, and
+	added a comment block describing the RamCart in more detail.
+
+	* pet/petmem.c, vic20/vic20mem.c: Fixed the
+	mem_get_screen_parameter() to fill in the correct data.
+
+	* vic20/vic-mem.c: Added a previously missing vic_peek()
+	function.
+
+	* vicii/vicii-cmdline-options.c: Added N_() for text that didn't
+	have it yet.
+
+	* video/video-resources.c: Fixed the crash that came from the
+	new PAL emu check.
+
 2008-06-29  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.21

Modified: branches/marco/ports/vice/src/version.h
===================================================================
--- branches/marco/ports/vice/src/version.h	2008-07-01 19:07:22 UTC (rev 18942)
+++ branches/marco/ports/vice/src/version.h	2008-07-01 23:35:17 UTC (rev 18943)
@@ -28,11 +28,11 @@
 #define __VERSION_H__
 
 #ifndef VERSION
-#define VERSION "1.22.21"
+#define VERSION "1.22.22"
 #endif
 
 #ifndef VERSION_RC_NUMBER
-#define VERSION_RC_NUMBER 1,22,21,0
+#define VERSION_RC_NUMBER 1,22,22,0
 #endif
 
 #ifndef PACKAGE


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

[Vice-emu-commit] SF.net SVN: vice-emu: [18942] tags/v1.22/v1.22.22/

From: <st...@us...> - 2008-07-01 19:07:14

Revision: 18942
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18942&view=rev
Author:   strik
Date:     2008-07-01 12:07:22 -0700 (Tue, 01 Jul 2008)

Log Message:
-----------
Tagged version 1.22.22.

Added Paths:
-----------
    tags/v1.22/v1.22.22/

Copied: tags/v1.22/v1.22.22 (from rev 18941, trunk)


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

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

From: <st...@us...> - 2008-07-01 19:06:59

Revision: 18941
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18941&view=rev
Author:   strik
Date:     2008-07-01 12:07:04 -0700 (Tue, 01 Jul 2008)

Log Message:
-----------
2008-07-01  Spiro Trikaliotis  <spi...@gm...>

	* Version 1.22.22

Modified Paths:
--------------
    trunk/vice/ChangeLog
    trunk/vice/configure.in
    trunk/vice/src/ChangeLog
    trunk/vice/src/version.h

Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog	2008-07-01 18:39:42 UTC (rev 18940)
+++ trunk/vice/ChangeLog	2008-07-01 19:07:04 UTC (rev 18941)
@@ -1,3 +1,7 @@
+2008-07-01  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.22
+
 2008-06-30  Marco van den Heuvel  <bla...@ya...>
 
 	* doc/html/plain/NEWS: Added mint and sol11 ports and corrected

Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in	2008-07-01 18:39:42 UTC (rev 18940)
+++ trunk/vice/configure.in	2008-07-01 19:07:04 UTC (rev 18941)
@@ -9,7 +9,7 @@
 
 VICE_VERSION_MAJOR=1
 VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=21
+VICE_VERSION_BUILD=22
 
 AC_SUBST(VICE_VERSION_MAJOR)
 AC_SUBST(VICE_VERSION_MINOR)

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-07-01 18:39:42 UTC (rev 18940)
+++ trunk/vice/src/ChangeLog	2008-07-01 19:07:04 UTC (rev 18941)
@@ -1,3 +1,7 @@
+2008-07-01  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.22
+
 2008-06-30  Marco van den Heuvel  <bla...@ya...>
 
 	* arch/amigaos/intl.c, arch/win32/res.rc,

Modified: trunk/vice/src/version.h
===================================================================
--- trunk/vice/src/version.h	2008-07-01 18:39:42 UTC (rev 18940)
+++ trunk/vice/src/version.h	2008-07-01 19:07:04 UTC (rev 18941)
@@ -28,11 +28,11 @@
 #define __VERSION_H__
 
 #ifndef VERSION
-#define VERSION "1.22.21"
+#define VERSION "1.22.22"
 #endif
 
 #ifndef VERSION_RC_NUMBER
-#define VERSION_RC_NUMBER 1,22,21,0
+#define VERSION_RC_NUMBER 1,22,22,0
 #endif
 
 #ifndef PACKAGE


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

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

From: <st...@us...> - 2008-07-01 18:39:44

Revision: 18940
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18940&view=rev
Author:   strik
Date:     2008-07-01 11:39:42 -0700 (Tue, 01 Jul 2008)

Log Message:
-----------
2008-06-30  Marco van den Heuvel  <bla...@ya...>

	* doc/html/plain/NEWS: Added mint and sol11 ports and corrected
	a typo.

	* doc/html/solaris.html: Added sol11 port.

	* po/nl.po: Updated.

	* src/arch/amigaos/intl.c, src/arch/win32/res.rc,
	src/arch/win32/reside64.rc, src/arch/win32/resmouse.rc,
	src/translate.c: Updated the Hungarian text.

	* src/arch/unix/qnx6/make-bindist.sh,
	src/arch/unix/sco_sol/make-bindist.sh,
	src/arch/unix/skyos/make-bindist.sh: Improved.

	* src/arch/unix/x11/gnome/x11ui.c: Corrected a typo.

	* src/arch/win32/resc128.rc, src/arch/win32/resc64.rc,
	src/arch/win32/rescbm2.rc, src/arch/win32/respet.rc,
	src/arch/win32/resplus4.rc, src/arch/win32/resvic20.rc: Updated
	the Hungarian text and extended the copy/paste text to the other
	languages.

	* src/arch/win32/uikeyboard.c: Fixed the shortcut text routine
	to work for win9x/winnt4 too.

	* src/c64/c64io.c, src/c64/georam.h: Fixed the reading of the
	GeoRAM registers.

	* src/c64/cart/c64cart.c: Fixed some text elements.

	* src/c64/georam.c: Fixed the reading of the GeoRAM registers,
	and added a comment block describing the GeoRAM in more detail.

	* src/c64/ramcart.c: Fixed the reading of the RamCart registers,
	and added a comment block describing the RamCart in more detail.

	* src/pet/petmem.c, src/vic20/vic20mem.c: Fixed the
	mem_get_screen_parameter() to fill in the correct data.

	* src/vic20/vic-mem.c: Added a previously missing vic_peek()
	function.

	* src/vicii/vicii-cmdline-options.c: Added N_() for text that
	didn't have it yet.

	* src/video/video-resources.c: Fixed the crash that came from
	the new PAL emu check.

Modified Paths:
--------------
    trunk/vice/ChangeLog
    trunk/vice/doc/html/plain/NEWS
    trunk/vice/doc/html/solaris.html
    trunk/vice/po/ChangeLog
    trunk/vice/po/nl.po
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/amigaos/intl.c
    trunk/vice/src/arch/unix/qnx6/make-bindist.sh
    trunk/vice/src/arch/unix/sco_sol/make-bindist.sh
    trunk/vice/src/arch/unix/skyos/make-bindist.sh
    trunk/vice/src/arch/unix/x11/gnome/x11ui.c
    trunk/vice/src/arch/win32/res.rc
    trunk/vice/src/arch/win32/resc128.rc
    trunk/vice/src/arch/win32/resc64.rc
    trunk/vice/src/arch/win32/rescbm2.rc
    trunk/vice/src/arch/win32/reside64.rc
    trunk/vice/src/arch/win32/resmouse.rc
    trunk/vice/src/arch/win32/respet.rc
    trunk/vice/src/arch/win32/resplus4.rc
    trunk/vice/src/arch/win32/resvic20.rc
    trunk/vice/src/arch/win32/uikeyboard.c
    trunk/vice/src/c64/c64io.c
    trunk/vice/src/c64/cart/c64cart.c
    trunk/vice/src/c64/georam.c
    trunk/vice/src/c64/georam.h
    trunk/vice/src/c64/ramcart.c
    trunk/vice/src/pet/petmem.c
    trunk/vice/src/translate.c
    trunk/vice/src/vic20/vic-mem.c
    trunk/vice/src/vic20/vic20mem.c
    trunk/vice/src/vicii/vicii-cmdline-options.c
    trunk/vice/src/video/video-resources.c

Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/ChangeLog	2008-07-01 18:39:42 UTC (rev 18940)
@@ -1,3 +1,10 @@
+2008-06-30  Marco van den Heuvel  <bla...@ya...>
+
+	* doc/html/plain/NEWS: Added mint and sol11 ports and corrected
+	a typo.
+
+	* doc/html/solaris.html: Added sol11 port.
+
 2008-06-29  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.21

Modified: trunk/vice/doc/html/plain/NEWS
===================================================================
--- trunk/vice/doc/html/plain/NEWS	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/doc/html/plain/NEWS	2008-07-01 18:39:42 UTC (rev 18940)
@@ -21,12 +21,16 @@
 
 - New SkyOS port.
 
+- New Atari Mint port.
+
+- New Solaris Express aka OpenSolaris aka Solaris 11 port.
+
 ** C64/C128 changes
 -------------------
 
 - Improved $01 behaviour with regards to unused bit fall-off.
 
-- Mew experimental NEOS and Amiga mouse support.
+- New experimental NEOS and Amiga mouse support.
 
 - Added a working RTC to the emulation of the IDE64 cartridge.
 

Modified: trunk/vice/doc/html/solaris.html
===================================================================
--- trunk/vice/doc/html/solaris.html	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/doc/html/solaris.html	2008-07-01 18:39:42 UTC (rev 18940)
@@ -81,6 +81,12 @@
 </li>
 
 <li>
+Binary for <b>Intel Solaris Express/OpenSolaris/Solaris 11</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-sol11-x86-local.gz">vice-2.0-sol11-x86-local.gz</a>.
+To be installed with the Solaris installer.
+</li>
+
+<li>
 Binary for <b>Sparc Solaris 2.6</b> systems:
 <a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-sol26-sparc-local.gz">vice-2.0-sol26-sparc-local.gz</a>.
 To be installed with the Solaris installer.

Modified: trunk/vice/po/ChangeLog
===================================================================
--- trunk/vice/po/ChangeLog	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/po/ChangeLog	2008-07-01 18:39:42 UTC (rev 18940)
@@ -1,3 +1,7 @@
+2008-06-30  Marco van den Heuvel  <bla...@ya...>
+
+	* nl.po: Updated.
+
 2008-06-19  Marco van den Heuvel  <bla...@ya...>
 
 	* nl.po: Updated.

Modified: trunk/vice/po/nl.po
===================================================================
--- trunk/vice/po/nl.po	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/po/nl.po	2008-07-01 18:39:42 UTC (rev 18940)
@@ -758,9 +758,8 @@
 msgstr "Koppel binair 16KB Action-Replay-III-cartridgebestand aan"
 
 #: src/c64/cart/c64cart.c:261
-#, fuzzy
 msgid "Attach raw 32KB Action Replay 4 cartridge image"
-msgstr "Koppel binair 32KB Action-Replay-cartridgebestand aan"
+msgstr "Koppel binair 32KB Action-Replay-4-cartridgebestand aan"
 
 #: src/c64/cart/c64cart.c:264 src/translate.c.po.c:1512
 msgid "Attach raw 64KB Retro Replay cartridge image"
@@ -799,9 +798,8 @@
 msgstr "Koppel binair Structured-Basic-cartridgebestand aan"
 
 #: src/c64/cart/c64cart.c:291
-#, fuzzy
 msgid "Attach raw StarDOS image"
-msgstr "Koppel een tapebestand"
+msgstr "Koppel binair StarDOS-bestand aan"
 
 #: src/c64/cart/c64cart.c:294 src/translate.c.po.c:1592
 msgid "Enable expert cartridge"
@@ -3039,14 +3037,12 @@
 msgstr "Koppel Action Replay III bestand..."
 
 #: src/arch/unix/gui/uic64cart.c:159
-#, fuzzy
 msgid "Attach Action Replay IV image..."
-msgstr "Koppel Action Replay III bestand..."
+msgstr "Koppel Action Replay IV bestand..."
 
 #: src/arch/unix/gui/uic64cart.c:162
-#, fuzzy
 msgid "Attach StarDOS image..."
-msgstr "Koppel tapebestand..."
+msgstr "Koppel StarDOS bestand..."
 
 #: src/arch/unix/gui/uic64cart.c:165
 msgid "Attach Atomic Power image..."
@@ -4145,30 +4141,27 @@
 
 #: src/arch/unix/gui/uipalemu.c:88 src/arch/unix/gui/uipalemu.c:148
 msgid "New PAL Tint"
-msgstr ""
+msgstr "Nieuwe PAL Tint"
 
 #: src/arch/unix/gui/uipalemu.c:88
-#, fuzzy
 msgid "Tint in percent"
-msgstr "Scanlijnschaduw in procent"
+msgstr "Tint in procent"
 
 #: src/arch/unix/gui/uipalemu.c:95
 msgid "New PAL Odd Line Phase"
-msgstr ""
+msgstr "Nieuwe PAL oneven lijnen fase"
 
 #: src/arch/unix/gui/uipalemu.c:95
-#, fuzzy
 msgid "Phase in percent"
-msgstr "Passband percentage"
+msgstr "Fase in procent"
 
 #: src/arch/unix/gui/uipalemu.c:102
 msgid "New PAL Odd Line Offset"
-msgstr ""
+msgstr "Nieuwe PAL oneven lijnen compensatie"
 
 #: src/arch/unix/gui/uipalemu.c:102
-#, fuzzy
 msgid "Offset in percent"
-msgstr "Wazigheid in procent"
+msgstr "Compensatie in procent"
 
 #: src/arch/unix/gui/uipalemu.c:110 src/arch/unix/gui/uipalemu.c:146
 msgid "PAL Blurredness"
@@ -4187,14 +4180,12 @@
 msgstr "*Snelle PAL-emulatie"
 
 #: src/arch/unix/gui/uipalemu.c:138
-#, fuzzy
 msgid "*Old Exact PAL Emulation"
-msgstr "*Exacte PAL-emulatie"
+msgstr "*Oude Exacte PAL-emulatie"
 
 #: src/arch/unix/gui/uipalemu.c:140
-#, fuzzy
 msgid "*New Exact PAL Emulation"
-msgstr "*Exacte PAL-emulatie"
+msgstr "*Nieuwe Exacte PAL-emulatie"
 
 #: src/arch/unix/gui/uipalemu.c:144
 msgid "PAL Scanline Shade"
@@ -4202,11 +4193,11 @@
 
 #: src/arch/unix/gui/uipalemu.c:150
 msgid "New PAL Odd Lines Phase"
-msgstr ""
+msgstr "Nieuwe PAL oneven lijnen fase"
 
 #: src/arch/unix/gui/uipalemu.c:152
 msgid "New PAL Odd Lines Offset"
-msgstr ""
+msgstr "Nieuwe PAL oneven lijnen compensatie"
 
 #: src/arch/unix/gui/uipalette.c:47
 msgid "Load custom palette"
@@ -5475,17 +5466,16 @@
 msgstr "Gamma"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:55 src/arch/win32/res.rc.po.c:2955
-#, fuzzy
 msgid "Tint"
-msgstr "Client"
+msgstr "Tint"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:56
 msgid "Odd Line Phase"
-msgstr ""
+msgstr "Oneven lijnen fase"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:57
 msgid "Odd Line Offset"
-msgstr ""
+msgstr "Oneven lijnen compensatie"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:145
 msgid "PAL Settings"
@@ -5500,9 +5490,8 @@
 msgstr "Exacte emulatie"
 
 #: src/arch/unix/x11/gnome/uipalcontrol.c:211
-#, fuzzy
 msgid "New Exact Emulation"
-msgstr "Exacte emulatie"
+msgstr "Nieuwe Exacte emulatie"
 
 #: src/arch/unix/x11/gnome/uinetplay.c:54 src/arch/win32/res.rc.po.c:4553
 #: src/arch/amigaos/intl.c.po.c:4466
@@ -6401,9 +6390,8 @@
 msgstr "Copyright (c) 2006-2008 Christian Vogelgsang"
 
 #: src/arch/win32/res.rc.po.c:568
-#, fuzzy
 msgid "Copyright (c) 2007-2008 Fabrizio Gennari"
-msgstr "Copyright (c) 2000-2004 Markus Brenner"
+msgstr "Copyright (c) 2000-2008 Fabrizio Gennari"
 
 #: src/arch/win32/res.rc.po.c:569
 msgid "Copyright (c) 1999-2007 Andreas Dehmel"
@@ -6709,11 +6697,11 @@
 
 #: src/arch/win32/res.rc.po.c:2958
 msgid "Odd lines phase"
-msgstr ""
+msgstr "Oneven lijnen fase"
 
 #: src/arch/win32/res.rc.po.c:2961
 msgid "Odd lines offset"
-msgstr ""
+msgstr "Oneven lijnen compensatie"
 
 #: src/arch/win32/res.rc.po.c:3096
 msgid "Phase"
@@ -7237,9 +7225,8 @@
 msgstr "Kleuren"
 
 #: src/arch/win32/res.rc.po.c:5131
-#, fuzzy
 msgid "New PAL emulation"
-msgstr "PAL-emulatie"
+msgstr "Nieuwe PAL emulatie"
 
 #: src/arch/win32/res.rc.po.c:5132 src/arch/amigaos/intl.c.po.c:4340
 msgid "Video settings"
@@ -7275,14 +7262,12 @@
 msgstr "Koppel Action Replay III cartridgebestand"
 
 #: src/arch/win32/res.rc.po.c:5143 src/arch/amigaos/intl.c.po.c:2405
-#, fuzzy
 msgid "Attach Action Replay 4 cartridge image"
-msgstr "Koppel Action Replay cartridgebestand"
+msgstr "Koppel Action Replay 4 cartridgebestand"
 
 #: src/arch/win32/res.rc.po.c:5144 src/arch/amigaos/intl.c.po.c:2414
-#, fuzzy
 msgid "Attach StarDOS cartridge image"
-msgstr "Koppel een cartridgebestand"
+msgstr "Koppel StarDOS cartridgebestand"
 
 #: src/arch/win32/res.rc.po.c:5145 src/arch/amigaos/intl.c.po.c:2423
 msgid "Attach Atomic Power cartridge image"
@@ -7805,19 +7790,16 @@
 msgstr "&Action Replay-bestand..."
 
 #: src/arch/win32/resc128.rc.po.c:67
-#, fuzzy
 msgid "&Action Replay 3 image..."
-msgstr "&Action Replay-bestand..."
+msgstr "&Action Replay 3 bestand..."
 
 #: src/arch/win32/resc128.rc.po.c:68
-#, fuzzy
 msgid "&Action Replay 4 image..."
-msgstr "&Action Replay-bestand..."
+msgstr "&Action Replay 4 bestand..."
 
 #: src/arch/win32/resc128.rc.po.c:69
-#, fuzzy
 msgid "&StarDOS image..."
-msgstr "&CRT-bestand..."
+msgstr "&StarDOS bestand..."
 
 #: src/arch/win32/resc128.rc.po.c:70 src/arch/win32/resc64.rc.po.c:70
 msgid "Atomic &Power image..."
@@ -8839,14 +8821,12 @@
 msgstr "Action Replay &III-bestand..."
 
 #: src/arch/win32/resc64.rc.po.c:68
-#, fuzzy
 msgid "Action Replay &4 image..."
-msgstr "Action Replay-bestand..."
+msgstr "Action Replay &4 bestand..."
 
 #: src/arch/win32/resc64.rc.po.c:69
-#, fuzzy
 msgid "Star&DOS image..."
-msgstr "&CRT-bestand..."
+msgstr "Star&DOS bestand..."
 
 #: src/arch/win32/resc64.rc.po.c:148 src/arch/amigaos/intl.c.po.c:843
 msgid "Netplay (experimental)..."
@@ -10028,12 +10008,10 @@
 msgstr "Nieuwe k&leuren"
 
 #: src/translate.c.po.c:1472
-#, fuzzy
 msgid "Attach raw 16KB StarDOS cartridge image"
-msgstr "Koppel binair 16KB cartridgebestand"
+msgstr "Koppel binair 16KB StarDOS cartridgebestand"
 
 #: src/translate.c.po.c:1482
-#, fuzzy
 msgid "Attach raw 32KB Action Replay IV cartridge image"
 msgstr "Koppel binair 32KB Action-Replay-cartridgebestand aan"
 
@@ -10042,17 +10020,16 @@
 msgstr "<0-2000>"
 
 #: src/translate.c.po.c:2696
-#, fuzzy
 msgid "Set tint of internal calculated palette [1000]"
-msgstr "Zet de verzadiging van het intern berekend kleurenpalet [1000]"
+msgstr "Zet de tint van het intern berekend kleuren palette [1000]"
 
 #: src/translate.c.po.c:2706
 msgid "Set phase for color carrier in odd lines [1250]"
-msgstr ""
+msgstr "Zet de fase van de kleuren drager in oneven lijnen [1250]"
 
 #: src/translate.c.po.c:2716
 msgid "Set phase offset for color carrier in odd lines [750]"
-msgstr ""
+msgstr "Zet de fase compensatie van de kleuren drager in oneven lijnen [750]"
 
 #: src/translate.c.po.c:2836
 msgid "<0-2>"
@@ -10191,19 +10168,16 @@
 msgstr "Action Replay-bestand..."
 
 #: src/arch/amigaos/intl.c.po.c:483
-#, fuzzy
 msgid "Action Replay 3 image..."
-msgstr "Action Replay-bestand..."
+msgstr "Action Replay 3 bestand..."
 
 #: src/arch/amigaos/intl.c.po.c:492
-#, fuzzy
 msgid "Action Replay 4 image..."
-msgstr "Action Replay-bestand..."
+msgstr "Action Replay 4 bestand..."
 
 #: src/arch/amigaos/intl.c.po.c:501
-#, fuzzy
 msgid "StarDOS image..."
-msgstr "CRT-bestand..."
+msgstr "StarDOS bestand..."
 
 #: src/arch/amigaos/intl.c.po.c:510
 msgid "Atomic Power image..."
@@ -10750,9 +10724,8 @@
 msgstr "Ja|Nee"
 
 #: src/arch/amigaos/intl.c.po.c:2396
-#, fuzzy
 msgid "Attach Action Replay 3 cartridge image"
-msgstr "Koppel Action Replay cartridgebestand"
+msgstr "Koppel Action Replay 3 cartridgebestand"
 
 #: src/arch/amigaos/intl.c.po.c:2558
 msgid "Attach"
@@ -11143,9 +11116,8 @@
 msgstr "Snelle PAL"
 
 #: src/arch/amigaos/intl.c.po.c:4214
-#, fuzzy
-msgid "New PAL Eulation"
-msgstr "PAL-emulatie"
+msgid "New PAL Emulation"
+msgstr "Nieuwe PAL emulatie"
 
 #: src/arch/amigaos/intl.c.po.c:4223
 msgid "Select External Palette file"
@@ -11164,19 +11136,16 @@
 msgstr "PAL-Wazigheid (0..1)"
 
 #: src/arch/amigaos/intl.c.po.c:4259
-#, fuzzy
 msgid "Tint (0..2)"
-msgstr "(0..2)"
+msgstr "Tint (0..2)"
 
 #: src/arch/amigaos/intl.c.po.c:4268
-#, fuzzy
 msgid "Odd Lines Phase (0..2)"
-msgstr "Helderheid (0..2)"
+msgstr "Oneven lijnen fase (0..2)"
 
 #: src/arch/amigaos/intl.c.po.c:4277
-#, fuzzy
 msgid "Odd Lines Offset (0..2)"
-msgstr "Helderheid (0..2)"
+msgstr "Oneven lijnen compensatie (0..2)"
 
 #: src/arch/amigaos/intl.c.po.c:4295
 msgid "External Palette"

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/src/ChangeLog	2008-07-01 18:39:42 UTC (rev 18940)
@@ -1,3 +1,47 @@
+2008-06-30  Marco van den Heuvel  <bla...@ya...>
+
+	* arch/amigaos/intl.c, arch/win32/res.rc,
+	arch/win32/reside64.rc, arch/win32/resmouse.rc, translate.c:
+	Updated the Hungarian text.
+
+	* arch/unix/qnx6/make-bindist.sh,
+	arch/unix/sco_sol/make-bindist.sh,
+	arch/unix/skyos/make-bindist.sh: Improved.
+
+	* arch/unix/x11/gnome/x11ui.c: Corrected a typo.
+
+	* arch/win32/resc128.rc, arch/win32/resc64.rc,
+	arch/win32/rescbm2.rc, arch/win32/respet.rc,
+	arch/win32/resplus4.rc, arch/win32/resvic20.rc: Updated the
+	Hungarian text and extended the copy/paste text to the other
+	languages.
+
+	* arch/win32/uikeyboard.c: Fixed the shortcut text routine to
+	work for win9x/winnt4 too.
+
+	* c64/c64io.c, c64/georam.h: Fixed the reading of the GeoRAM
+	registers.
+
+	* c64/cart/c64cart.c: Fixed some text elements.
+
+	* c64/georam.c: Fixed the reading of the GeoRAM registers, and
+	added a comment block describing the GeoRAM in more detail.
+
+	* c64/ramcart.c: Fixed the reading of the RamCart registers, and
+	added a comment block describing the RamCart in more detail.
+
+	* pet/petmem.c, vic20/vic20mem.c: Fixed the
+	mem_get_screen_parameter() to fill in the correct data.
+
+	* vic20/vic-mem.c: Added a previously missing vic_peek()
+	function.
+
+	* vicii/vicii-cmdline-options.c: Added N_() for text that didn't
+	have it yet.
+
+	* video/video-resources.c: Fixed the crash that came from the
+	new PAL emu check.
+
 2008-06-29  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.21

Modified: trunk/vice/src/arch/amigaos/intl.c
===================================================================
--- trunk/vice/src/arch/amigaos/intl.c	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/src/arch/amigaos/intl.c	2008-07-01 18:39:42 UTC (rev 18940)
@@ -195,7 +195,7 @@
 /* en */ {IDMS_ALL,    "All"},
 /* de */ {IDMS_ALL_DE, "Alle"},
 /* fr */ {IDMS_ALL_FR, "Tout"},
-/* hu */ {IDMS_ALL_HU, "Mindegyik"},
+/* hu */ {IDMS_ALL_HU, "\xD6sszes"},
 /* it */ {IDMS_ALL_IT, "Tutti"},
 /* nl */ {IDMS_ALL_NL, "Alles"},
 /* pl */ {IDMS_ALL_PL, ""},  /* fuzzy */
@@ -672,7 +672,7 @@
 /* en */ {IDMS_CART_FREEZE,    "Cartridge freeze"},
 /* de */ {IDMS_CART_FREEZE_DE, "Erweiterungsmodul Freeze"},
 /* fr */ {IDMS_CART_FREEZE_FR, "Geler la cartouche"},
-/* hu */ {IDMS_CART_FREEZE_HU, "Fagyaszt\xE1s Cartridge-el"},
+/* hu */ {IDMS_CART_FREEZE_HU, "Fagyaszt\xE1s Cartridge-dzsel"},
 /* it */ {IDMS_CART_FREEZE_IT, "Freeze della cartuccia"},
 /* nl */ {IDMS_CART_FREEZE_NL, "Cartridge freeze"},
 /* pl */ {IDMS_CART_FREEZE_PL, ""},  /* fuzzy */
@@ -1113,7 +1113,7 @@
 /* en */ {IDMS_SCALE2X,    "Scale2x"},
 /* de */ {IDMS_SCALE2X_DE, "Scale2x"},
 /* fr */ {IDMS_SCALE2X_FR, "Scale2x"},
-/* hu */ {IDMS_SCALE2X_HU, "2x m\xE9retez"},
+/* hu */ {IDMS_SCALE2X_HU, "\xC9lsim\xEDt\xE1s"},
 /* it */ {IDMS_SCALE2X_IT, "Scale2x"},
 /* nl */ {IDMS_SCALE2X_NL, "Schaal2x"},
 /* pl */ {IDMS_SCALE2X_PL, ""},  /* fuzzy */
@@ -1167,7 +1167,7 @@
 /* en */ {IDMS_VIRTUAL_DEVICE_TRAPS,    "Virtual device traps"},
 /* de */ {IDMS_VIRTUAL_DEVICE_TRAPS_DE, "Virtuelle Ger\xE4te Traps"},
 /* fr */ {IDMS_VIRTUAL_DEVICE_TRAPS_FR, "Activer les p\xE9riph\xE9riques virtuels"},
-/* hu */ {IDMS_VIRTUAL_DEVICE_TRAPS_HU, "*Virtu\xE1lis eszk\xF6z\xF6k ciklus kihagy\xE1sa"},
+/* hu */ {IDMS_VIRTUAL_DEVICE_TRAPS_HU, "Virtu\xE1lis eszk\xF6z\xF6k ciklus kihagy\xE1sa"},
 /* it */ {IDMS_VIRTUAL_DEVICE_TRAPS_IT, "Attiva le periferiche virtuali"},
 /* nl */ {IDMS_VIRTUAL_DEVICE_TRAPS_NL, "Virtuele apparaattraps"},
 /* pl */ {IDMS_VIRTUAL_DEVICE_TRAPS_PL, ""},  /* fuzzy */
@@ -1266,7 +1266,7 @@
 /* en */ {IDMS_GRAB_MOUSE,    "Grab mouse events"},
 /* de */ {IDMS_GRAB_MOUSE_DE, "Maus Ereignisse abfangen"},
 /* fr */ {IDMS_GRAB_MOUSE_FR, ""},  /* fuzzy */
-/* hu */ {IDMS_GRAB_MOUSE_HU, ""},  /* fuzzy */
+/* hu */ {IDMS_GRAB_MOUSE_HU, "Eg\xE9r esem\xE9nyek elkap\xE1sa"},
 /* it */ {IDMS_GRAB_MOUSE_IT, ""},  /* fuzzy */
 /* nl */ {IDMS_GRAB_MOUSE_NL, "Gebruik de muis"},
 /* pl */ {IDMS_GRAB_MOUSE_PL, ""},  /* fuzzy */
@@ -1410,7 +1410,7 @@
 /* en */ {IDMS_MOUSE_SETTINGS,    "Mouse settings..."},
 /* de */ {IDMS_MOUSE_SETTINGS_DE, "Maus Einstellungen..."},
 /* fr */ {IDMS_MOUSE_SETTINGS_FR, ""},  /* fuzzy */
-/* hu */ {IDMS_MOUSE_SETTINGS_HU, ""},  /* fuzzy */
+/* hu */ {IDMS_MOUSE_SETTINGS_HU, "Eg\xE9r be\xE1ll\xEDt\xE1sai..."},
 /* it */ {IDMS_MOUSE_SETTINGS_IT, ""},  /* fuzzy */
 /* nl */ {IDMS_MOUSE_SETTINGS_NL, "Muis instellingen..."},
 /* pl */ {IDMS_MOUSE_SETTINGS_PL, ""},  /* fuzzy */
@@ -1689,7 +1689,7 @@
 /* en */ {IDMS_ABOUT,    "About..."},
 /* de */ {IDMS_ABOUT_DE, "\xDCber VICE..."},
 /* fr */ {IDMS_ABOUT_FR, "\xC0 Propos..."},
-/* hu */ {IDMS_ABOUT_HU, "A VICE-r\xF3l..."},
+/* hu */ {IDMS_ABOUT_HU, "N\xE9vjegy..."},
 /* it */ {IDMS_ABOUT_IT, "Informazioni..."},
 /* nl */ {IDMS_ABOUT_NL, "Over VICE..."},
 /* pl */ {IDMS_ABOUT_PL, ""},  /* fuzzy */
@@ -3323,7 +3323,7 @@
 /* en */ {IDS_SAVE_SETTINGS_ON_EXIT,    "Save settings (resources) on exit"},
 /* de */ {IDS_SAVE_SETTINGS_ON_EXIT_DE, "Einstellungen (Ressourcen) beim Beenden speichern"},
 /* fr */ {IDS_SAVE_SETTINGS_ON_EXIT_FR, "Sauvegarder les parametres   la sortie"},
-/* hu */ {IDS_SAVE_SETTINGS_ON_EXIT_HU, "Er\xF5forr\xE1sbe\xE1ll\xEDt\xE1sok ment\xE9se kil\xE9p\xE9skor"},
+/* hu */ {IDS_SAVE_SETTINGS_ON_EXIT_HU, "Be\xE1ll\xEDt\xE1sok (er\xF5forr\xE1sok) ment\xE9se kil\xE9p\xE9skor"},
 /* it */ {IDS_SAVE_SETTINGS_ON_EXIT_IT, "Salva le impostazioni in uscita"},
 /* nl */ {IDS_SAVE_SETTINGS_ON_EXIT_NL, "Instellingen (resources) opslaan bij afsluiten"},
 /* pl */ {IDS_SAVE_SETTINGS_ON_EXIT_PL, ""},  /* fuzzy */
@@ -3332,7 +3332,7 @@
 /* en */ {IDS_NEVER_SAVE_SETTINGS_EXIT,    "Never save settings (resources) on exit"},
 /* de */ {IDS_NEVER_SAVE_SETTINGS_EXIT_DE, "Einstellungen beim Beenden nie speichern"},
 /* fr */ {IDS_NEVER_SAVE_SETTINGS_EXIT_FR, "Ne jamais enregistrer les parametres   la sortie"},
-/* hu */ {IDS_NEVER_SAVE_SETTINGS_EXIT_HU, "Sose mentse az er\xF5forr\xE1sbe\xE1ll\xEDt\xE1sokat kil\xE9p\xE9skor"},
+/* hu */ {IDS_NEVER_SAVE_SETTINGS_EXIT_HU, "Sose mentse a be\xE1ll\xEDt\xE1sokat (er\xF5forr\xE1sokat) kil\xE9p\xE9skor"},
 /* it */ {IDS_NEVER_SAVE_SETTINGS_EXIT_IT, "Non salvare mai le impostazioni in uscita"},
 /* nl */ {IDS_NEVER_SAVE_SETTINGS_EXIT_NL, "Instellingen (resources) niet opslaan bij afsluiten"},
 /* pl */ {IDS_NEVER_SAVE_SETTINGS_EXIT_PL, ""},  /* fuzzy */
@@ -3899,7 +3899,7 @@
 /* en */ {IDS_CYLINDERS,    "Cylinders"},
 /* de */ {IDS_CYLINDERS_DE, "Zylinder"},
 /* fr */ {IDS_CYLINDERS_FR, "Cylindres"},
-/* hu */ {IDS_CYLINDERS_HU, "Cilinderek"},
+/* hu */ {IDS_CYLINDERS_HU, "S\xE1vok"},
 /* it */ {IDS_CYLINDERS_IT, "Cilindri"},
 /* nl */ {IDS_CYLINDERS_NL, "Cylinders"},
 /* pl */ {IDS_CYLINDERS_PL, ""},  /* fuzzy */
@@ -4196,7 +4196,7 @@
 /* en */ {IDS_CANNOT_READ_SNAPSHOT_IMG,    "Cannot read snapshot image"},
 /* de */ {IDS_CANNOT_READ_SNAPSHOT_IMG_DE, "Kann Snapshot Datei nicht laden"},
 /* fr */ {IDS_CANNOT_READ_SNAPSHOT_IMG_FR, ""},  /* fuzzy */
-/* hu */ {IDS_CANNOT_READ_SNAPSHOT_IMG_HU, "Nem siker\xFClt bet\xF6lteni a pillanatk\xE9p f\xE1jlt"},
+/* hu */ {IDS_CANNOT_READ_SNAPSHOT_IMG_HU, "A pillanatk\xE9p f\xE1jl nem olvashat\xF3"},
 /* it */ {IDS_CANNOT_READ_SNAPSHOT_IMG_IT, "Non \xE8 possibile leggere l'immagine dello snapshot"},
 /* nl */ {IDS_CANNOT_READ_SNAPSHOT_IMG_NL, "Kan momentopname bestand niet lezen"},
 /* pl */ {IDS_CANNOT_READ_SNAPSHOT_IMG_PL, ""},  /* fuzzy */
@@ -4238,7 +4238,7 @@
 /* pl */ {IDS_PAL_EMULATION_PL, ""},  /* fuzzy */
 /* sv */ {IDS_PAL_EMULATION_SV, "PAL-emulering"},
 
-/* en */ {IDS_NEW_PAL_EMULATION,    "New PAL Eulation"},
+/* en */ {IDS_NEW_PAL_EMULATION,    "New PAL Emulation"},
 /* de */ {IDS_NEW_PAL_EMULATION_DE, ""},  /* fuzzy */
 /* fr */ {IDS_NEW_PAL_EMULATION_FR, ""},  /* fuzzy */
 /* hu */ {IDS_NEW_PAL_EMULATION_HU, ""},  /* fuzzy */
@@ -4288,7 +4288,7 @@
 /* fr */ {IDS_NEW_PAL_TINT_0_2_FR, ""},  /* fuzzy */
 /* hu */ {IDS_NEW_PAL_TINT_0_2_HU, ""},  /* fuzzy */
 /* it */ {IDS_NEW_PAL_TINT_0_2_IT, ""},  /* fuzzy */
-/* nl */ {IDS_NEW_PAL_TINT_0_2_NL, ""},  /* fuzzy */
+/* nl */ {IDS_NEW_PAL_TINT_0_2_NL, "Tint (0..2)"},
 /* pl */ {IDS_NEW_PAL_TINT_0_2_PL, ""},  /* fuzzy */
 /* sv */ {IDS_NEW_PAL_TINT_0_2_SV, ""},  /* fuzzy */
 
@@ -4297,7 +4297,7 @@
 /* fr */ {IDS_NEW_PAL_PHASE_0_2_FR, ""},  /* fuzzy */
 /* hu */ {IDS_NEW_PAL_PHASE_0_2_HU, ""},  /* fuzzy */
 /* it */ {IDS_NEW_PAL_PHASE_0_2_IT, ""},  /* fuzzy */
-/* nl */ {IDS_NEW_PAL_PHASE_0_2_NL, ""},  /* fuzzy */
+/* nl */ {IDS_NEW_PAL_PHASE_0_2_NL, "Oneven lijnen fase (0..2)"},
 /* pl */ {IDS_NEW_PAL_PHASE_0_2_PL, ""},  /* fuzzy */
 /* sv */ {IDS_NEW_PAL_PHASE_0_2_SV, ""},  /* fuzzy */
 
@@ -4306,7 +4306,7 @@
 /* fr */ {IDS_NEW_PAL_OFFSET_0_2_FR, ""},  /* fuzzy */
 /* hu */ {IDS_NEW_PAL_OFFSET_0_2_HU, ""},  /* fuzzy */
 /* it */ {IDS_NEW_PAL_OFFSET_0_2_IT, ""},  /* fuzzy */
-/* nl */ {IDS_NEW_PAL_OFFSET_0_2_NL, ""},  /* fuzzy */
+/* nl */ {IDS_NEW_PAL_OFFSET_0_2_NL, "Oneven lijnen compensatie (0..2)"},
 /* pl */ {IDS_NEW_PAL_OFFSET_0_2_PL, ""},  /* fuzzy */
 /* sv */ {IDS_NEW_PAL_OFFSET_0_2_SV, ""},  /* fuzzy */
 
@@ -4799,7 +4799,7 @@
 /* en */ {IDS_MOUSE_TYPE,    "Mouse type"},
 /* de */ {IDS_MOUSE_TYPE_DE, "Maustyp"},
 /* fr */ {IDS_MOUSE_TYPE_FR, ""},  /* fuzzy */
-/* hu */ {IDS_MOUSE_TYPE_HU, ""},  /* fuzzy */
+/* hu */ {IDS_MOUSE_TYPE_HU, "Eg\xE9r t\xEDpusa"},
 /* it */ {IDS_MOUSE_TYPE_IT, ""},  /* fuzzy */
 /* nl */ {IDS_MOUSE_TYPE_NL, "Muis soort"},
 /* pl */ {IDS_MOUSE_TYPE_PL, ""},  /* fuzzy */
@@ -4808,7 +4808,7 @@
 /* en */ {IDS_MOUSE_SETTINGS,    "Mouse Settings"},
 /* de */ {IDS_MOUSE_SETTINGS_DE, "Maus Einstellungen"},
 /* fr */ {IDS_MOUSE_SETTINGS_FR, ""},  /* fuzzy */
-/* hu */ {IDS_MOUSE_SETTINGS_HU, ""},  /* fuzzy */
+/* hu */ {IDS_MOUSE_SETTINGS_HU, "Eg\xE9r be\xE1ll\xEDt\xE1sok"},
 /* it */ {IDS_MOUSE_SETTINGS_IT, ""},  /* fuzzy */
 /* nl */ {IDS_MOUSE_SETTINGS_NL, "Muis Instellingen"},
 /* pl */ {IDS_MOUSE_SETTINGS_PL, ""},  /* fuzzy */
@@ -4826,7 +4826,7 @@
 /* en */ {IDS_MOUSE_1351,    "1351 mouse"},
 /* de */ {IDS_MOUSE_1351_DE, "1351 Maus"},
 /* fr */ {IDS_MOUSE_1351_FR, ""},  /* fuzzy */
-/* hu */ {IDS_MOUSE_1351_HU, ""},  /* fuzzy */
+/* hu */ {IDS_MOUSE_1351_HU, "1351 eg\xE9r"},
 /* it */ {IDS_MOUSE_1351_IT, ""},  /* fuzzy */
 /* nl */ {IDS_MOUSE_1351_NL, "1351 muis"},
 /* pl */ {IDS_MOUSE_1351_PL, ""},  /* fuzzy */
@@ -4835,7 +4835,7 @@
 /* en */ {IDS_MOUSE_NEOS,    "NEOS mouse"},
 /* de */ {IDS_MOUSE_NEOS_DE, "NEOS Maus"},
 /* fr */ {IDS_MOUSE_NEOS_FR, ""},  /* fuzzy */
-/* hu */ {IDS_MOUSE_NEOS_HU, ""},  /* fuzzy */
+/* hu */ {IDS_MOUSE_NEOS_HU, "NEOS eg\xE9r"},
 /* it */ {IDS_MOUSE_NEOS_IT, ""},  /* fuzzy */
 /* nl */ {IDS_MOUSE_NEOS_NL, "NEOS muis"},
 /* pl */ {IDS_MOUSE_NEOS_PL, ""},  /* fuzzy */
@@ -4844,7 +4844,7 @@
 /* en */ {IDS_MOUSE_AMIGA,    "Amiga mouse"},
 /* de */ {IDS_MOUSE_AMIGA_DE, "Amiga Maus"},
 /* fr */ {IDS_MOUSE_AMIGA_FR, ""},  /* fuzzy */
-/* hu */ {IDS_MOUSE_AMIGA_HU, ""},  /* fuzzy */
+/* hu */ {IDS_MOUSE_AMIGA_HU, "Amiga eg\xE9r"},
 /* it */ {IDS_MOUSE_AMIGA_IT, ""},  /* fuzzy */
 /* nl */ {IDS_MOUSE_AMIGA_NL, "Amiga muis"},
 /* pl */ {IDS_MOUSE_AMIGA_PL, ""},  /* fuzzy */

Modified: trunk/vice/src/arch/unix/qnx6/make-bindist.sh
===================================================================
--- trunk/vice/src/arch/unix/qnx6/make-bindist.sh	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/src/arch/unix/qnx6/make-bindist.sh	2008-07-01 18:39:42 UTC (rev 18940)
@@ -33,7 +33,7 @@
 echo Generating QNX 6 port binary distribution.
 rm -f -r VICE-$VICEVERSION
 curdir=`pwd`
-$MAKECOMMAND prefix=$curdir/VICE-$VERSION/opt $curdir/VICEDIR=VICE-$VERSION/opt/lib/vice install
+$MAKECOMMAND prefix=$curdir/VICE-$VICEVERSION/opt VICEDIR=$curdir/VICE-$VICEVERSION/opt/lib/vice install
 $STRIP VICE-$VICEVERSION/opt/bin/x64
 $STRIP VICE-$VICEVERSION/opt/bin/x128
 $STRIP VICE-$VICEVERSION/opt/bin/xvic

Modified: trunk/vice/src/arch/unix/sco_sol/make-bindist.sh
===================================================================
--- trunk/vice/src/arch/unix/sco_sol/make-bindist.sh	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/src/arch/unix/sco_sol/make-bindist.sh	2008-07-01 18:39:42 UTC (rev 18940)
@@ -1,4 +1,4 @@
-#!/bin/sh
+\#!/bin/sh
 # make-bindist.sh for the OPENSERVER, UNIXWARE & SOLARIS ports
 #
 # written by Marco van den Heuvel <bla...@ya...>
@@ -19,6 +19,46 @@
 shift
 MAKECOMMAND=$9
 
+setnormalmake()
+{
+  makefound="none"
+  OLD_IFS=$IFS
+  IFS=":"
+
+  for i in /usr/ccs/bin:$PATH
+  do
+    if [ -e $i/make ]; then
+      GNUMAKE=`$i/make --version`
+      case "$GNUMAKE" in
+        GNU*)
+          ;;
+        *)
+          if test x"$makefound" = "xnone"; then
+            makefound="$i/make"
+          fi
+          ;;
+      esac
+    fi
+  done
+  if test x"$makefound" = "xnone"; then
+    echo no suitable make found for bindist
+    exit 1
+  else
+    MAKECOMMAND=$makefound
+  fi
+  IFS=$OLD_IFS
+}
+
+checkmake()
+{
+  GNUMAKE=`$MAKECOMMAND --version`
+  case "$GNUMAKE" in
+  GNU*)
+     setnormalmake
+     ;;
+  esac
+}
+
 if test x"$PREFIX" != "x/usr/local"; then
   echo Error: installation path is not /usr/local
   exit 1
@@ -26,14 +66,17 @@
 
 if test x"$SYSTEM" = "xsco7"; then
   PLATFORM="UNIXWARE 7.x"
+  checkmake
 fi
 
 if test x"$SYSTEM" = "xsco6"; then
   PLATFORM="OPENSERVER 6.x"
+  checkmake
 fi
 
 if test x"$SYSTEM" = "xsco5"; then
   PLATFORM="OPENSERVER 5.x"
+  checkmake
 fi
 
 if test x"$SYSTEM" = "xsol"; then
@@ -54,7 +97,7 @@
 echo Generating $PLATFORM port binary distribution.
 rm -f -r VICE-$VICEVERSION
 curdir=`pwd`
-$MAKECOMMAND prefix=$curdir/VICE-$VICEVERSION/usr/local VICEDIR=$curdir/VICE-$VICEVERSION/usr/local/lib/vice install
+$MAKECOMMAND -e prefix=$curdir/VICE-$VICEVERSION/usr/local VICEDIR=$curdir/VICE-$VICEVERSION/usr/local/lib/vice install
 $STRIP VICE-$VICEVERSION/usr/local/bin/x64
 $STRIP VICE-$VICEVERSION/usr/local/bin/x128
 $STRIP VICE-$VICEVERSION/usr/local/bin/xvic
@@ -114,6 +157,10 @@
     if test x"$arch_version" = "x5.10"; then
       arch_version=sol10
     fi
+
+    if test x"$arch_version" = "x5.11"; then
+      arch_version=sol11
+    fi
   else
     arch_cpu=x86
 

Modified: trunk/vice/src/arch/unix/skyos/make-bindist.sh
===================================================================
--- trunk/vice/src/arch/unix/skyos/make-bindist.sh	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/src/arch/unix/skyos/make-bindist.sh	2008-07-01 18:39:42 UTC (rev 18940)
@@ -27,7 +27,7 @@
 echo Generating SkyOS port binary distribution.
 rm -f -r VICE-$VERSION
 curdir=`pwd`
-$MAKECOMMAND prefix=$curdir/VICE-$VERSION/programs/VICE VICEDIR=$curdir/VICE-$VERSION/programs/VICE/lib/vice install
+$MAKECOMMAND -e prefix=$curdir/VICE-$VERSION/programs/VICE VICEDIR=$curdir/VICE-$VERSION/programs/VICE/lib/vice install
 mv VICE-$VERSION/programs/VICE/bin/x64 VICE-$VERSION/programs/VICE/bin/x64.app
 $STRIP VICE-$VERSION/programs/VICE/bin/x64.app
 mv VICE-$VERSION/programs/VICE/bin/x128 VICE-$VERSION/programs/VICE/bin/x128.app

Modified: trunk/vice/src/arch/unix/x11/gnome/x11ui.c
===================================================================
--- trunk/vice/src/arch/unix/x11/gnome/x11ui.c	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/src/arch/unix/x11/gnome/x11ui.c	2008-07-01 18:39:42 UTC (rev 18940)
@@ -1822,7 +1822,7 @@
 					     _("Reset"), 0, 
 					     _("Hard Reset"), 1,
 					     _("Monitor"), 2,
-					     _("Monitor"), 3,
+					     _("Continue"), 3,
 					     NULL);
     g_signal_connect(G_OBJECT(jam_dialog),
 		     "destroy",

Modified: trunk/vice/src/arch/win32/res.rc
===================================================================
--- trunk/vice/src/arch/win32/res.rc	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/src/arch/win32/res.rc	2008-07-01 18:39:42 UTC (rev 18940)
@@ -790,7 +790,7 @@
                     BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
     AUTOCHECKBOX    "P00 f\xE1jlok &ment\xE9se",IDC_TOGGLE_WRITEP00,185,120,61,10,
                     BS_AUTOCHECKBOX | WS_TABSTOP
-    AUTOCHECKBOX    "P00 f\xE1jlok &elrejt\xE9se",IDC_TOGGLE_HIDENONP00,185,135,73,10,
+    AUTOCHECKBOX    "Nem P00 f\xE1jlok &elrejt\xE9se",IDC_TOGGLE_HIDENONP00,185,135,73,10,
                     BS_AUTOCHECKBOX | WS_TABSTOP
 END
 #pragma code_page(28591)
@@ -3284,10 +3284,10 @@
     LTEXT           "Tint",IDC_STATIC,12,12,60,8
     LTEXT           "(0..2)",IDC_STATIC,72,12,28,8
     EDITTEXT        IDC_VIDEO_NEW_PAL_TINT, 105,10,32,12,WS_TABSTOP
-    LTEXT           "Odd lines phase",IDC_STATIC,12,24,60,8
+    LTEXT           "Oneven lijnen fase",IDC_STATIC,12,24,60,8
     LTEXT           "(0..2)",IDC_STATIC,72,24,28,8
     EDITTEXT        IDC_VIDEO_NEW_PAL_PHASE, 105,22,32,12,WS_TABSTOP
-    LTEXT           "Odd lines offset",IDC_STATIC,12,36,60,8
+    LTEXT           "Oneven lijnen compensatie",IDC_STATIC,12,36,60,8
     LTEXT           "(0..2)",IDC_STATIC,72,36,28,8
     EDITTEXT        IDC_VIDEO_NEW_PAL_OFFSET, 105,34,32,12,WS_TABSTOP
 END
@@ -6011,7 +6011,7 @@
   IDS_CANNOT_LOAD_SETTINGS        "A be\xE1ll\xEDt\xE1sok bet\xF6lt\xE9se nem siker\xFClt."
   IDS_DEFAULT_SETTINGS_RESTORED   "Alap\xE9rtelmezett be\xE1ll\xEDt\xE1sok vissza\xE1ll\xEDtva."
   IDS_CANNOT_ATTACH_FILE          "Nem lehet csatolni a megadott f\xE1jlt"
-  IDS_START_MONITOR               "%s\n\nInd\xEDtsam a monitort?"
+  IDS_START_MONITOR               "%s\n\nMonitorprogram ind\xEDt\xE1sa? (Nem \xFAjraind\xEDtja, M\xE9gsem folytatja)"
   IDS_VICE_CPU_JAM                "VICE CPU fagy\xE1s"
   IDS_EXTEND_TO_40_TRACKS         "Kiterjesszem a k\xE9pm\xE1st 40 s\xE1vos form\xE1tumra?"
   IDS_DETACHED_DEVICE_S           "%s eszk\xF6z lev\xE1lasztva"
@@ -6041,8 +6041,8 @@
   IDS_SAVE_FLIP_LIST_FILE         "Lemezlista ment\xE9se f\xE1jlba"
   IDS_CANNOT_WRITE_FLIP_LIST      "Nem siker\xFClt a lemezlist\xE1t f\xE1jlba \xEDrni"
   IDS_SELECT_KEYMAP_FILE          "V\xE1lasszon billenty\xFBzetlek\xE9pez\xE9s f\xE1jlt"
-  IDS_SAVE_KEYMAP_FILE            "Billenty\xFBzetkioszt\xE1s f\xE1jlba \xEDr\xE1sa"
-  IDS_CANNOT_WRITE_KEYMAP_FILE    "Nem siker\xFClt a billenty\xFBzetkioszt\xE1st f\xE1jlba \xEDrni"
+  IDS_SAVE_KEYMAP_FILE            "Billenty\xFBzetlek\xE9pez\xE9s f\xE1jlba \xEDr\xE1sa"
+  IDS_CANNOT_WRITE_KEYMAP_FILE    "Nem siker\xFClt a billenty\xFBzetlek\xE9pez\xE9st f\xE1jlba \xEDrni"
   IDS_MAPPING                     "Lek\xE9pez\xE9s"
   IDS_KEYBOARD_SETTINGS           "Billenty\xFBzet be\xE1ll\xEDt\xE1sai"
   IDS_ATTACH                      "&Csatol\xE1s"
@@ -6064,7 +6064,7 @@
   IDS_DRIVE_11                    "#11-es lemezegys\xE9g"
   IDS_PERIPHERAL_SETTINGS         "Perif\xE9ri\xE1k be\xE1ll\xEDt\xE1sai"
   IDS_CANT_WRITE_SNAPSHOT_FILE    "Nem siker\xFClt a pillanatk\xE9p f\xE1jl \xEDr\xE1sa."
-  IDS_CANNOT_READ_SNAPSHOT_IMG    "Nem siker\xFClt bet\xF6lteni a pillanatk\xE9p f\xE1jlt"
+  IDS_CANNOT_READ_SNAPSHOT_IMG    "A pillanatk\xE9p f\xE1jl nem olvashat\xF3"
   IDS_LOAD_S_ROM_IMAGE            "%s ROM k\xE9pm\xE1s bet\xF6lt\xE9se"
   IDS_SELECT_ROMSET_ARCHIVE       "V\xE1lasszon ROM k\xE9szlet arch\xEDvumot"
   IDS_CANNOT_LOAD_ROMSET_ARCH     "Nem siker\xFClt a ROM k\xE9szlet arch\xEDvum bet\xF6lt\xE9se!"
@@ -6145,8 +6145,8 @@
   IDS_FLIP_LIST_FILES_FILTER      "VICE lemezlista f\xE1jlok (*.vfl)"
   IDS_ROMSET_FILES_FILTER         "VICE ROM k\xE9szlet f\xE1jlok (*.vrs)"
   IDS_ROMSET_ARCHIVES_FILTER      "VICE ROM k\xE9szlet arch\xEDvumok (*.vra)"
-  IDS_KEYMAP_FILES_FILTER         "VICE billenty\xFB lek\xE9pez\xE9s f\xE1jlok (*.vkm)"
-  IDS_PRGP00_FILES_FILTER         "Commodore emulator files (*.prg;*.p00)"
+  IDS_KEYMAP_FILES_FILTER         "VICE billenty\xFBlek\xE9pez\xE9s f\xE1jlok (*.vkm)"
+  IDS_PRGP00_FILES_FILTER         "Commodore emul\xE1tor f\xE1jlok (*.prg; *.p00)"
   IDS_FLEXIBLE                    "Rugalmas"
   IDS_ADJUSTING                   "Igazod\xF3"
   IDS_EXACT                       "Pontos"
@@ -6166,8 +6166,8 @@
   IDS_P_NUMBER                    "<sz\xE1m>"
   IDS_SET_INPUT_JOYSTICK_1        "Port 1-es botkorm\xE1ny eszk\xF6z megad\xE1sa"
   IDS_SET_INPUT_JOYSTICK_2        "Port 2-es botkorm\xE1ny eszk\xF6z megad\xE1sa"
-  IDS_SAVE_SETTINGS_ON_EXIT       "Er\xF5forr\xE1sbe\xE1ll\xEDt\xE1sok ment\xE9se kil\xE9p\xE9skor"
-  IDS_NO_SAVE_SETTINGS_ON_EXIT    "Sose mentse az er\xF5forr\xE1sbe\xE1ll\xEDt\xE1sokat kil\xE9p\xE9skor"
+  IDS_SAVE_SETTINGS_ON_EXIT       "Be\xE1ll\xEDt\xE1sok (er\xF5forr\xE1sok) ment\xE9se kil\xE9p\xE9skor"
+  IDS_NO_SAVE_SETTINGS_ON_EXIT    "Sose mentse a be\xE1ll\xEDt\xE1sokat (er\xF5forr\xE1sokat) kil\xE9p\xE9skor"
   IDS_CONFIRM_QUIT_VICE           "Meger\xF5s\xEDt\xE9s kil\xE9p\xE9s el\xF5tt"
   IDS_NO_CONFIRM_QUIT_VICE        "Sosem k\xE9r meger\xF5s\xEDt\xE9st kil\xE9p\xE9s el\xF5tt"
   IDS_USE_ALL_CPU_SMP             "SMP rendszereken az \xF6sszes CPU haszn\xE1lata"

Modified: trunk/vice/src/arch/win32/resc128.rc
===================================================================
--- trunk/vice/src/arch/win32/resc128.rc	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/src/arch/win32/resc128.rc	2008-07-01 18:39:42 UTC (rev 18940)
@@ -400,6 +400,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Snapshot &Image Laden...", IDM_SNAPSHOT_LOAD
@@ -666,6 +671,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Quitter", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Sauvegarde"
     BEGIN
         MENUITEM "C&harger une sauvegarde....", IDM_SNAPSHOT_LOAD
@@ -844,12 +854,12 @@
             MENUITEM "#1&0-es lemezegys\xE9g", IDM_DETACH_10
             MENUITEM "#&11-es lemezegys\xE9g", IDM_DETACH_11
             MENUITEM SEPARATOR
-            MENUITEM "\xD6&sszes", IDM_DETACH_ALL
+            MENUITEM "&Mindegyik", IDM_DETACH_ALL
         END
         POPUP "Lemezl&ista"
         BEGIN
-            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s ho&zz\xE1ad\xE1sa",     IDM_FLIP_ADD
-            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s el&t\xE1vol\xEDt\xE1sa",  IDM_FLIP_REMOVE
+            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s hozz\xE1ad\xE1sa",     IDM_FLIP_ADD
+            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s elt\xE1vol\xEDt\xE1sa",  IDM_FLIP_REMOVE
             MENUITEM "&K\xF6vetkez\xF5 k\xE9pm\xE1s csatol\xE1sa",     IDM_FLIP_NEXT
             MENUITEM "&El\xF5z\xF5 k\xE9pm\xE1s csatol\xE1sa", IDM_FLIP_PREVIOUS
             MENUITEM SEPARATOR
@@ -857,7 +867,7 @@
             MENUITEM "Lemezlista ment\xE9&se", IDM_FLIP_SAVE
         END
         MENUITEM SEPARATOR
-        MENUITEM "Szalag k\xE9pm\xE1s csatol\xE1sa...", IDM_ATTACH_TAPE
+        MENUITEM "&Szalag k\xE9pm\xE1s csatol\xE1sa...", IDM_ATTACH_TAPE
         MENUITEM "Sz&alag k\xE9pm\xE1s lev\xE1laszt\xE1sa",           IDM_DETACH_TAPE
         POPUP "Magn\xF3 &vez\xE9rl\xE9s"
         BEGIN
@@ -901,7 +911,7 @@
             MENUITEM "\xDAjraind\xEDt\xE1s cartridge &cser\xE9n\xE9l", IDM_TOGGLE_CART_RESET
         END
         MENUITEM "Cartridge k\xE9pm\xE1s &lev\xE1laszt\xE1sa",  IDM_CART_DETACH
-        MENUITEM "Fagyaszt\xE1s Cartridge-el", IDM_CART_FREEZE
+        MENUITEM "&Fagyaszt\xE1s Cartridge-dzsel", IDM_CART_FREEZE
         MENUITEM SEPARATOR
         MENUITEM "&Sz\xFCnet", IDM_PAUSE, CHECKED
         MENUITEM "&Monitor", IDM_MONITOR
@@ -933,12 +943,17 @@
         MENUITEM SEPARATOR
         MENUITEM "&Kil\xE9p\xE9s", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Pillanatk\xE9p"
     BEGIN
         MENUITEM "Pillanatk\xE9p &bet\xF6lt\xE9se...",          IDM_SNAPSHOT_LOAD
         MENUITEM "Pillanatk\xE9p &ment\xE9se...",          IDM_SNAPSHOT_SAVE
-        MENUITEM "Gyors pillanatk\xE9p b&et\xF6lt\xE9se", IDM_LOADQUICK
-        MENUITEM "Gyors pillanatk\xE9p me&nt\xE9se", IDM_SAVEQUICK
+        MENUITEM "Gyors pillanatk\xE9p &bet\xF6lt\xE9se", IDM_LOADQUICK
+        MENUITEM "Gyors pillanatk\xE9p f\xE1jl &ment\xE9se", IDM_SAVEQUICK
         MENUITEM SEPARATOR
         MENUITEM "Esem\xE9ny &felv\xE9tel ind\xEDt\xE1sa/le\xE1ll\xEDt\xE1sa",       IDM_EVENT_TOGGLE_RECORD
         MENUITEM "Esem\xE9ny &visszaj\xE1tsz\xE1s ind\xEDt\xE1sa/le\xE1ll\xEDt\xE1sa",        IDM_EVENT_TOGGLE_PLAYBACK
@@ -998,7 +1013,7 @@
         MENUITEM "&Dupla m\xE9ret", IDM_TOGGLE_DOUBLESIZE, CHECKED
         MENUITEM "Du&pla p\xE1szt\xE1z\xE1s", IDM_TOGGLE_DOUBLESCAN, CHECKED
         MENUITEM "PAL emul\xE1ci\xF3", IDM_TOGGLE_FASTPAL, CHECKED
-        MENUITEM "2x m\xE9retez",       IDM_TOGGLE_SCALE2X, CHECKED
+        MENUITEM "\xC9lsim\xEDt\xE1s",       IDM_TOGGLE_SCALE2X, CHECKED
         POPUP "VDC be\xE1ll\xEDt\xE1sai"
         BEGIN
             MENUITEM "&Dupla m\xE9ret", IDM_TOGGLE_VDC_DOUBLESIZE
@@ -1007,7 +1022,7 @@
             MENUITEM "64KB k\xE9perny\xF5 &mem\xF3ria", IDM_TOGGLE_VDC64KB
         END
         MENUITEM SEPARATOR
-        MENUITEM "Botkorm\xE1nyok felcser\xE9l\xE9se", IDM_SWAP_JOYSTICK
+        MENUITEM "Botkorm\xE1nyok &felcser\xE9l\xE9se", IDM_SWAP_JOYSTICK
         MENUITEM SEPARATOR
         MENUITEM "&Hangok enged\xE9lyez\xE9se", IDM_TOGGLE_SOUND, CHECKED
         MENUITEM SEPARATOR
@@ -1022,7 +1037,7 @@
         MENUITEM SEPARATOR
         MENUITEM "Emul\xE1tor &azonos\xEDt\xF3", IDM_TOGGLE_EMUID
         MENUITEM "IEEE&488 interf\xE9sz emul\xE1ci\xF3",    IDM_IEEE488
-        MENUITEM "&Grab mouse events",    IDM_MOUSE
+        MENUITEM "Eg\xE9r &esem\xE9nyek elkap\xE1sa",    IDM_MOUSE
     END
     POPUP "B&e\xE1ll\xEDt\xE1sok"
     BEGIN
@@ -1033,7 +1048,7 @@
         MENUITEM "VIC-II be\xE1ll\xEDt\xE1sai...",     IDM_VICII_SETTINGS
         MENUITEM "B&otkorm\xE1ny be\xE1ll\xEDt\xE1sai...",  IDM_JOY_SETTINGS
         MENUITEM "&Billenty\xFBzet be\xE1ll\xEDt\xE1sai...",  IDM_KEYBOARD_SETTINGS
-        MENUITEM "Mo&use settings...",     IDM_MOUSE_SETTINGS
+        MENUITEM "Eg\xE9r &be\xE1ll\xEDt\xE1sai...",     IDM_MOUSE_SETTINGS
         MENUITEM "Hang be\xE1ll\xEDt\xE1sok...",     IDM_SOUND_SETTINGS
         MENUITEM "S&ID be\xE1ll\xEDt\xE1sai...",       IDM_SID_SETTINGS
         MENUITEM "&ROM-ok be\xE1ll\xEDt\xE1sai...",       IDM_ROM_SETTINGS
@@ -1200,6 +1215,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&sci", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Carica &immagine dello snapshot...", IDM_SNAPSHOT_LOAD
@@ -1466,6 +1486,11 @@
         MENUITEM SEPARATOR
         MENUITEM "Af&sluiten", IDM_EXIT
     END
+    POPUP "&Bewerken"
+    BEGIN
+        MENUITEM "&Kopie", IDM_EDIT_COPY
+        MENUITEM "&Plakken", IDM_EDIT_PASTE
+    END
     POPUP "Momento&pname"
     BEGIN
         MENUITEM "Laad momentopnamebest&and...",          IDM_SNAPSHOT_LOAD
@@ -1733,6 +1758,11 @@
         MENUITEM SEPARATOR
         MENUITEM "W&yjd\xBC", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "z&rzutu"
     BEGIN
         MENUITEM "Za\xB3adu&j zrzut...", IDM_SNAPSHOT_LOAD
@@ -2000,6 +2030,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Avsluta", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&\xD6gonblicksbild"
     BEGIN
         MENUITEM "&L\xE4s in \xF6gonblicksbild...", IDM_SNAPSHOT_LOAD

Modified: trunk/vice/src/arch/win32/resc64.rc
===================================================================
--- trunk/vice/src/arch/win32/resc64.rc	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/src/arch/win32/resc64.rc	2008-07-01 18:39:42 UTC (rev 18940)
@@ -397,6 +397,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Snapshot &Image Laden...", IDM_SNAPSHOT_LOAD
@@ -660,6 +665,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Quitter", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Sauvegarde"
     BEGIN
         MENUITEM "C&harger une sauvegarde....", IDM_SNAPSHOT_LOAD
@@ -835,12 +845,12 @@
             MENUITEM "#1&0-es lemezegys\xE9g", IDM_DETACH_10
             MENUITEM "#&11-es lemezegys\xE9g", IDM_DETACH_11
             MENUITEM SEPARATOR
-            MENUITEM "\xD6&sszes", IDM_DETACH_ALL
+            MENUITEM "&Mindegyik", IDM_DETACH_ALL
         END
         POPUP "Lemezl&ista"
         BEGIN
-            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s ho&zz\xE1ad\xE1sa",     IDM_FLIP_ADD
-            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s el&t\xE1vol\xEDt\xE1sa",  IDM_FLIP_REMOVE
+            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s hozz\xE1ad\xE1sa",     IDM_FLIP_ADD
+            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s elt\xE1vol\xEDt\xE1sa",  IDM_FLIP_REMOVE
             MENUITEM "&K\xF6vetkez\xF5 k\xE9pm\xE1s csatol\xE1sa",     IDM_FLIP_NEXT
             MENUITEM "&El\xF5z\xF5 k\xE9pm\xE1s csatol\xE1sa", IDM_FLIP_PREVIOUS
             MENUITEM SEPARATOR
@@ -848,7 +858,7 @@
             MENUITEM "Lemezlista ment\xE9&se", IDM_FLIP_SAVE
         END
         MENUITEM SEPARATOR
-        MENUITEM "Szalag k\xE9pm\xE1s csatol\xE1sa...", IDM_ATTACH_TAPE
+        MENUITEM "&Szalag k\xE9pm\xE1s csatol\xE1sa...", IDM_ATTACH_TAPE
         MENUITEM "Sz&alag k\xE9pm\xE1s lev\xE1laszt\xE1sa",           IDM_DETACH_TAPE
         POPUP "Magn\xF3 &vez\xE9rl\xE9s"
         BEGIN
@@ -892,7 +902,7 @@
             MENUITEM "\xDAjraind\xEDt\xE1s cartridge &cser\xE9n\xE9l", IDM_TOGGLE_CART_RESET
         END
         MENUITEM "Cartridge k\xE9pm\xE1s &lev\xE1laszt\xE1sa",  IDM_CART_DETACH
-        MENUITEM "Fagyaszt\xE1s Cartridge-el", IDM_CART_FREEZE
+        MENUITEM "&Fagyaszt\xE1s Cartridge-dzsel", IDM_CART_FREEZE
         MENUITEM SEPARATOR
         MENUITEM "&Sz\xFCnet", IDM_PAUSE, CHECKED
         MENUITEM "&Monitor", IDM_MONITOR
@@ -924,12 +934,17 @@
         MENUITEM SEPARATOR
         MENUITEM "&Kil\xE9p\xE9s", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Pillanatk\xE9p"
     BEGIN
         MENUITEM "Pillanatk\xE9p &bet\xF6lt\xE9se...",          IDM_SNAPSHOT_LOAD
         MENUITEM "Pillanatk\xE9p &ment\xE9se...",          IDM_SNAPSHOT_SAVE
-        MENUITEM "Gyors pillanatk\xE9p b&et\xF6lt\xE9se", IDM_LOADQUICK
-        MENUITEM "Gyors pillanatk\xE9p me&nt\xE9se", IDM_SAVEQUICK
+        MENUITEM "Gyors pillanatk\xE9p &bet\xF6lt\xE9se", IDM_LOADQUICK
+        MENUITEM "Gyors pillanatk\xE9p f\xE1jl &ment\xE9se", IDM_SAVEQUICK
         MENUITEM SEPARATOR
         MENUITEM "Esem\xE9ny &felv\xE9tel ind\xEDt\xE1sa/le\xE1ll\xEDt\xE1sa",       IDM_EVENT_TOGGLE_RECORD
         MENUITEM "Esem\xE9ny &visszaj\xE1tsz\xE1s ind\xEDt\xE1sa/le\xE1ll\xEDt\xE1sa",        IDM_EVENT_TOGGLE_PLAYBACK
@@ -991,9 +1006,9 @@
         MENUITEM "&Dupla m\xE9ret", IDM_TOGGLE_DOUBLESIZE, CHECKED
         MENUITEM "Du&pla p\xE1szt\xE1z\xE1s", IDM_TOGGLE_DOUBLESCAN, CHECKED
         MENUITEM "PAL emul\xE1ci\xF3", IDM_TOGGLE_FASTPAL, CHECKED
-        MENUITEM "2x m\xE9retez", IDM_TOGGLE_SCALE2X, CHECKED
+        MENUITEM "\xC9lsim\xEDt\xE1s", IDM_TOGGLE_SCALE2X, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Botkorm\xE1nyok felcser\xE9l\xE9se", IDM_SWAP_JOYSTICK
+        MENUITEM "Botkorm\xE1nyok &felcser\xE9l\xE9se", IDM_SWAP_JOYSTICK
         MENUITEM SEPARATOR
         MENUITEM "&Hangok enged\xE9lyez\xE9se", IDM_TOGGLE_SOUND, CHECKED
         MENUITEM SEPARATOR
@@ -1008,7 +1023,7 @@
         END
         MENUITEM SEPARATOR
         MENUITEM "Emul\xE1tor &azonos\xEDt\xF3", IDM_TOGGLE_EMUID
-        MENUITEM "&Grab mouse events",    IDM_MOUSE
+        MENUITEM "Eg\xE9r &esem\xE9nyek elkap\xE1sa",    IDM_MOUSE
     END
     POPUP "B&e\xE1ll\xEDt\xE1sok"
     BEGIN
@@ -1019,7 +1034,7 @@
         MENUITEM "VIC-II be\xE1ll\xEDt\xE1sai...",     IDM_VICII_SETTINGS
         MENUITEM "B&otkorm\xE1ny be\xE1ll\xEDt\xE1sai...",  IDM_JOY_SETTINGS
         MENUITEM "&Billenty\xFBzet be\xE1ll\xEDt\xE1sai...",  IDM_KEYBOARD_SETTINGS
-        MENUITEM "Mo&use settings...",     IDM_MOUSE_SETTINGS
+        MENUITEM "Eg\xE9r &be\xE1ll\xEDt\xE1sai...",     IDM_MOUSE_SETTINGS
         MENUITEM "Hang be\xE1ll\xEDt\xE1sok...",     IDM_SOUND_SETTINGS
         MENUITEM "S&ID be\xE1ll\xEDt\xE1sai...",       IDM_SID_SETTINGS
         MENUITEM "&ROM-ok be\xE1ll\xEDt\xE1sai...",       IDM_ROM_SETTINGS
@@ -1188,6 +1203,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&sci", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Carica &immagine dello snapshot...", IDM_SNAPSHOT_LOAD
@@ -1451,6 +1471,11 @@
         MENUITEM SEPARATOR
         MENUITEM "Af&sluiten", IDM_EXIT
     END
+    POPUP "&Bewerken"
+    BEGIN
+        MENUITEM "&Kopie", IDM_EDIT_COPY
+        MENUITEM "&Plakken", IDM_EDIT_PASTE
+    END
     POPUP "Momento&pname"
     BEGIN
         MENUITEM "Laad momentopnamebest&and...", IDM_SNAPSHOT_LOAD
@@ -1715,6 +1740,11 @@
         MENUITEM SEPARATOR
         MENUITEM "W&yjd\xBC", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "z&rzutu"
     BEGIN
         MENUITEM "Za\xB3adu&j zrzut...", IDM_SNAPSHOT_LOAD
@@ -1979,6 +2009,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Avsluta", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&\xD6gonblicksbild"
     BEGIN
         MENUITEM "&L\xE4s in \xF6gonblicksbild...", IDM_SNAPSHOT_LOAD

Modified: trunk/vice/src/arch/win32/rescbm2.rc
===================================================================
--- trunk/vice/src/arch/win32/rescbm2.rc	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/src/arch/win32/rescbm2.rc	2008-07-01 18:39:42 UTC (rev 18940)
@@ -317,6 +317,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Snapshot &Image Laden...",          IDM_SNAPSHOT_LOAD
@@ -531,6 +536,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Quitter", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Sauvegarde"
     BEGIN
         MENUITEM "C&harger une sauvegarde....",          IDM_SNAPSHOT_LOAD
@@ -689,12 +699,12 @@
             MENUITEM "#1&0-es lemezegys\xE9g", IDM_DETACH_10
             MENUITEM "#&11-es lemezegys\xE9g", IDM_DETACH_11
             MENUITEM SEPARATOR
-            MENUITEM "\xD6&sszes",      IDM_DETACH_ALL
+            MENUITEM "&Mindegyik",      IDM_DETACH_ALL
         END
         POPUP "Lemezl&ista"
         BEGIN
-            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s ho&zz\xE1ad\xE1sa",     IDM_FLIP_ADD
-            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s el&t\xE1vol\xEDt\xE1sa",  IDM_FLIP_REMOVE
+            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s hozz\xE1ad\xE1sa",     IDM_FLIP_ADD
+            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s elt\xE1vol\xEDt\xE1sa",  IDM_FLIP_REMOVE
             MENUITEM "&K\xF6vetkez\xF5 k\xE9pm\xE1s csatol\xE1sa",     IDM_FLIP_NEXT
             MENUITEM "&El\xF5z\xF5 k\xE9pm\xE1s csatol\xE1sa", IDM_FLIP_PREVIOUS
             MENUITEM SEPARATOR
@@ -702,7 +712,7 @@
             MENUITEM "Lemezlista ment\xE9&se", IDM_FLIP_SAVE
         END
         MENUITEM SEPARATOR
-        MENUITEM "Szalag k\xE9pm\xE1s csatol\xE1sa...", IDM_ATTACH_TAPE
+        MENUITEM "&Szalag k\xE9pm\xE1s csatol\xE1sa...", IDM_ATTACH_TAPE
         MENUITEM "Sz&alag k\xE9pm\xE1s lev\xE1laszt\xE1sa",           IDM_DETACH_TAPE
 #if 1
         POPUP "Magn\xF3 &vez\xE9rl\xE9s"
@@ -748,12 +758,17 @@
         MENUITEM SEPARATOR
         MENUITEM "&Kil\xE9p\xE9s", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Pillanatk\xE9p"
     BEGIN
         MENUITEM "Pillanatk\xE9p &bet\xF6lt\xE9se...",          IDM_SNAPSHOT_LOAD
         MENUITEM "Pillanatk\xE9p &ment\xE9se...",          IDM_SNAPSHOT_SAVE
-        MENUITEM "Gyors pillanatk\xE9p b&et\xF6lt\xE9se", IDM_LOADQUICK
-        MENUITEM "Gyors pillanatk\xE9p me&nt\xE9se", IDM_SAVEQUICK
+        MENUITEM "Gyors pillanatk\xE9p &bet\xF6lt\xE9se", IDM_LOADQUICK
+        MENUITEM "Gyors pillanatk\xE9p f\xE1jl &ment\xE9se", IDM_SAVEQUICK
         MENUITEM SEPARATOR
         MENUITEM "Esem\xE9ny &felv\xE9tel ind\xEDt\xE1sa/le\xE1ll\xEDt\xE1sa",       IDM_EVENT_TOGGLE_RECORD
         MENUITEM "Esem\xE9ny &visszaj\xE1tsz\xE1s ind\xEDt\xE1sa/le\xE1ll\xEDt\xE1sa",        IDM_EVENT_TOGGLE_PLAYBACK
@@ -816,7 +831,7 @@
         MENUITEM "Du&pla p\xE1szt\xE1z\xE1s", IDM_TOGGLE_CRTCDOUBLESCAN
             , CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Botkorm\xE1nyok felcser\xE9l\xE9se", IDM_SWAP_JOYSTICK
+        MENUITEM "Botkorm\xE1nyok &felcser\xE9l\xE9se", IDM_SWAP_JOYSTICK
         MENUITEM SEPARATOR
         MENUITEM "&Hangok enged\xE9lyez\xE9se", IDM_TOGGLE_SOUND, CHECKED
         MENUITEM SEPARATOR
@@ -963,6 +978,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&sci", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Carica &immagine dello snapshot...",          IDM_SNAPSHOT_LOAD
@@ -1179,6 +1199,11 @@
         MENUITEM SEPARATOR
         MENUITEM "Af&sluiten", IDM_EXIT
     END
+    POPUP "&Bewerken"
+    BEGIN
+        MENUITEM "&Kopie", IDM_EDIT_COPY
+        MENUITEM "&Plakken", IDM_EDIT_PASTE
+    END
     POPUP "Momento&pname"
     BEGIN
         MENUITEM "Laad momentopnamebest&and...",          IDM_SNAPSHOT_LOAD
@@ -1396,6 +1421,11 @@
         MENUITEM SEPARATOR
         MENUITEM "W&yjd\xBC", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "z&rzutu"
     BEGIN
         MENUITEM "Za\xB3adu&j zrzut...",          IDM_SNAPSHOT_LOAD
@@ -1611,6 +1641,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Avsluta", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&\xD6gonblicksbild"
     BEGIN
         MENUITEM "&L\xE4s in \xF6gonblicksbild...",          IDM_SNAPSHOT_LOAD

Modified: trunk/vice/src/arch/win32/reside64.rc
===================================================================
--- trunk/vice/src/arch/win32/reside64.rc	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/src/arch/win32/reside64.rc	2008-07-01 18:39:42 UTC (rev 18940)
@@ -98,7 +98,7 @@
     IDS_IDE64_IMAGE             "&Merevlemez k\xE9pm\xE1s f\xE1jl"
     IDS_IDE64_GEOMETRY          "&Geometria"
     IDS_IDE64_AUTODETECT        "&Automatikus \xE9rz\xE9kel\xE9s"
-    IDS_IDE64_CYLINDERS         "Cilinderek"
+    IDS_IDE64_CYLINDERS         "S\xE1vok"
     IDS_IDE64_HEADS             "Fejek"
     IDS_IDE64_SECTORS           "Szektorok"
     IDS_IDE64_TOTAL_SIZE        "Teljes m\xE9ret: %iKB"

Modified: trunk/vice/src/arch/win32/resmouse.rc
===================================================================
--- trunk/vice/src/arch/win32/resmouse.rc	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/src/arch/win32/resmouse.rc	2008-07-01 18:39:42 UTC (rev 18940)
@@ -74,7 +74,7 @@
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Sans Serif"
 BEGIN
-    LTEXT           "Mouse type",
+    LTEXT           "Eg\xE9r t\xEDpusa",
                     IDC_MOUSE_TYPE_LABEL, 9, 6, 53, 8
     COMBOBOX        IDC_MOUSE_TYPE, 70, 5, 80, 80, CBS_DROPDOWNLIST |
                     WS_VSCROLL | WS_TABSTOP

Modified: trunk/vice/src/arch/win32/respet.rc
===================================================================
--- trunk/vice/src/arch/win32/respet.rc	2008-06-30 23:41:44 UTC (rev 18939)
+++ trunk/vice/src/arch/win32/respet.rc	2008-07-01 18:39:42 UTC (rev 18940)
@@ -313,6 +313,11 @@
        MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Snapshot &Image Laden...", IDM_SNAPSHOT_LOAD
@@ -525,6 +530,11 @@
        MENUITEM SEPARATOR
         MENUITEM "&Quitter", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Sauvegarde"
     BEGIN
         MENUITEM "C&harger une sauvegarde....", IDM_SNAPSHOT_LOAD
@@ -681,12 +691,12 @@
             MENUITEM "#1&0-es lemezegys\xE9g", IDM_DETACH_10
             MENUITEM "#&11-es lemezegys\xE9g", IDM_DETACH_11
             MENUITEM SEPARATOR
-            MENUITEM "\xD6&sszes", IDM_DETACH_ALL
+            MENUITEM "&Mindegyik", IDM_DETACH_ALL
         END
         POPUP "Lemezl&ista"
         BEGIN
-            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s ho&zz\xE1ad\xE1sa",     IDM_FLIP_ADD
-            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s el&t\xE1vol\xEDt\xE1sa",  IDM_FLIP_REMOVE
+            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s hozz\xE1ad\xE1sa",     IDM_FLIP_ADD
+            MENUITEM "Az aktu\xE1lis k\xE9pm\xE1s elt\xE1vol\xEDt\xE1sa",  IDM_FLIP_REMOVE
             MENUITEM "&K\xF6vetkez\xF5 k\xE9pm\xE1s csatol\xE1sa",     IDM_FLIP_NEXT
             MENUITEM "&El\xF5z\xF5 k\xE9pm\xE1s csatol\xE1sa", IDM_FLIP_PREVIOUS
             MENUITEM SEPARATOR
@@ -694,7 +704,7 @@
             MENUITEM "Lemezlista ment\xE9&se", IDM_FLIP_SAVE
         END
         MENUITEM SEPARATOR
-        MENUITEM "Szalag k\xE9pm\xE1s csatol\xE1sa...", IDM_ATTACH_TAPE
+        MENUITEM "&Szalag k\xE9pm\xE1s csatol\xE1sa...", IDM_ATTACH_TAPE
         MENUITEM "Sz&alag k\xE9pm\xE1s lev\xE1laszt\xE1sa",           IDM_DETACH_TAPE
         POPUP "Magn\xF3 &vez\xE9rl\xE9s"
         BEGIN
@@ -738,12 +748,17 @@
        MENUITEM SEPARATOR
         MENUITEM "&Kil\xE9p\xE9s", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Pillanatk\xE9p"
     BEGIN
         MENUITEM "Pillanatk\xE9p &bet\xF6lt\xE9se...", IDM_SNAPSHOT_LOAD
         MENUITEM "Pillanatk\xE9p &ment\xE9se...", IDM_SNAPSHOT_SAVE
-        MENUITEM "Gyors pillanatk\xE9p b&et\xF6lt\xE9se", IDM_LOADQUICK
-        MENUITEM "Gyors pillanatk\xE9p me&nt\xE9se", IDM_SAVEQUICK
+        MENUITEM "Gyors pillanatk\xE9p &bet\xF6lt\xE9se", IDM_LOADQUICK
+        MENUITEM "Gyors pillanatk\xE9p f\xE1jl &ment\xE9se", IDM_SAVEQUICK
         MENUITEM SEPARATOR
         MENUITEM "Esem\xE9ny &felv\xE9tel ind\xEDt\xE1sa/le\xE1ll\xEDt\xE1sa",       IDM_EVENT_TOGGLE_RECORD
         MENUITEM "Esem\xE9ny &visszaj\xE1tsz\xE1s ind\xEDt\xE1sa/le\xE1ll\xEDt\xE1sa",        IDM_EVENT_TOGGLE_PLAYBACK
@@ -804,7 +819,7 @@
         MENUITEM "&Dupla m\xE9ret", IDM_TOGGLE_CRTCDOUBLESIZE, CHECKED
         MENUITEM "Du&pla p\xE1szt\xE1z\xE1s", IDM_TOGGLE_CRTCDOUBLESCAN, CHECKED
         MENUITEM SEPARATOR
-	MENUITEM "Botkorm\xE1nyok felcser\xE9l\xE9se", IDM_SWAP_JOYSTICK
+	MENUITEM "Botkorm\xE1nyok &felcser\xE9l\xE9se", IDM_SWAP_JOYSTICK
 	MENUITEM SEPARATOR
         MENUITEM "&Hangok enged\xE9lyez\xE9se", IDM_TOGGLE_SOUND, CHECKED
         MENUITEM SEPARATOR
@@ -951,6 +966,11 @@
        MENUITEM SEPARATOR
         MENUITEM "E&sci", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Carica &immagine dello snapshot...", IDM_SNAPSHOT_LOAD
@@ -1163,6 +1183,11 @@
        MENUITEM SEPARATOR
         MENUITEM "Af&sluiten", IDM_EXIT
     END
+    POPUP "&Bewerken"
+    BEGIN
+        MENUITEM "&Kopie", IDM_EDIT_COPY
+        MENUITEM "&Plakken", IDM_EDIT_PASTE
+    END
     POPUP "Momento&pname"
     BEGIN
         MENUITEM "Laad momentopnamebest&and...", IDM_SNAPSHOT_LOAD
@@ -1376,6 +1401,11 @@
        MENUITEM SEPARATOR
         MENUITEM "W&yjd\xBC", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "z&rzutu"
     BEGIN
         MENUITEM "Za\xB3adu&j zrzut...", IDM_SNAPSHOT_LOAD
@@ -1589,6 +1619,11 @@
        MENUITEM SEPARATOR
         MENUITEM "&Avsluta", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&\xD6gonblicksbild"
     BEGIN
         MENUITEM "&L\xE4s in \xF6gonblicksbild...", IDM_SNAPSHOT_LOAD

Modified: trunk/vice/src/arch/win32/resplus4.rc
=====================================================...
 
[truncated message content]

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

From: <bla...@us...> - 2008-06-30 23:41:40

Revision: 18939
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18939&view=rev
Author:   blackystardust
Date:     2008-06-30 16:41:44 -0700 (Mon, 30 Jun 2008)

Log Message:
-----------
Extended the mem_get_screen_parameter() function to include a bank, which makes xcbm2 work with copy/paste now.

Modified Paths:
--------------
    branches/marco/ports/vice/src/arch/win32/ui.c
    branches/marco/ports/vice/src/c128/c128mem.c
    branches/marco/ports/vice/src/c64/c64mem.c
    branches/marco/ports/vice/src/cbm2/cbm2mem.c
    branches/marco/ports/vice/src/mem.h
    branches/marco/ports/vice/src/monitor/monitor.c
    branches/marco/ports/vice/src/pet/petmem.c
    branches/marco/ports/vice/src/plus4/plus4mem.c
    branches/marco/ports/vice/src/vic20/vic20mem.c

Modified: branches/marco/ports/vice/src/arch/win32/ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/win32/ui.c	2008-06-30 07:13:13 UTC (rev 18938)
+++ branches/marco/ports/vice/src/arch/win32/ui.c	2008-06-30 23:41:44 UTC (rev 18939)
@@ -992,9 +992,10 @@
         BYTE allrows, allcols;
         unsigned int row, col;
         unsigned int size;
+        int bank;
         char * p;
 
-        mem_get_screen_parameter(&base, &allrows, &allcols);
+        mem_get_screen_parameter(&base, &allrows, &allcols, &bank);
 
         size = allrows * (allcols + 2) + 1;
 
@@ -1011,7 +1012,7 @@
             for (col = 0; col < allcols; col++) {
                 BYTE data;
 
-                data = mem_bank_peek(0, base++, NULL);
+                data = mem_bank_peek(bank, base++, NULL);
                 data = charset_p_toascii(charset_screencode_to_petcii(data), 1);
 
                 if (data != ' ') {

Modified: branches/marco/ports/vice/src/c128/c128mem.c
===================================================================
--- branches/marco/ports/vice/src/c128/c128mem.c	2008-06-30 07:13:13 UTC (rev 18938)
+++ branches/marco/ports/vice/src/c128/c128mem.c	2008-06-30 23:41:44 UTC (rev 18939)
@@ -1123,12 +1123,13 @@
     return mem_ioreg_list;
 }
 
-void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns)
+void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns, int *bank)
 {
     *base = ((vicii_peek(0xd018) & 0xf0) << 6)
             | ((~cia2_peek(0xdd00) & 0x03) << 14);
     *rows = 25;
     *columns = 40;
+    *bank = 0;
 }
 
 /* ------------------------------------------------------------------------- */

Modified: branches/marco/ports/vice/src/c64/c64mem.c
===================================================================
--- branches/marco/ports/vice/src/c64/c64mem.c	2008-06-30 07:13:13 UTC (rev 18938)
+++ branches/marco/ports/vice/src/c64/c64mem.c	2008-06-30 23:41:44 UTC (rev 18939)
@@ -1060,12 +1060,13 @@
     return mem_ioreg_list;
 }
 
-void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns)
+void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns, int *bank)
 {
     *base = ((vicii_peek(0xd018) & 0xf0) << 6)
             | ((~cia2_peek(0xdd00) & 0x03) << 14);
     *rows = 25;
     *columns = 40;
+    *bank = 0;
 }
 
 /* ------------------------------------------------------------------------- */

Modified: branches/marco/ports/vice/src/cbm2/cbm2mem.c
===================================================================
--- branches/marco/ports/vice/src/cbm2/cbm2mem.c	2008-06-30 07:13:13 UTC (rev 18938)
+++ branches/marco/ports/vice/src/cbm2/cbm2mem.c	2008-06-30 23:41:44 UTC (rev 18939)
@@ -1146,12 +1146,12 @@
     return mem_ioreg_list;
 }
 
-void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns)
+void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns, int *bank)
 {
-    /* FIXME */
-    *base = 0;
+    *base = 0xd000;
     *rows = 25;
-    *columns = 80;
+    *columns = (cbm2_isC500) ? 40 : 80;
+    *bank = 16;
 }
 
 void mem_color_ram_to_snapshot(BYTE *color_ram)

Modified: branches/marco/ports/vice/src/mem.h
===================================================================
--- branches/marco/ports/vice/src/mem.h	2008-06-30 07:13:13 UTC (rev 18938)
+++ branches/marco/ports/vice/src/mem.h	2008-06-30 23:41:44 UTC (rev 18939)
@@ -75,7 +75,7 @@
 extern BYTE mem_bank_read(int bank, WORD addr, void *context);
 extern BYTE mem_bank_peek(int bank, WORD addr, void *context);
 extern void mem_bank_write(int bank, WORD addr, BYTE byte, void *context);
-extern void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns);
+extern void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns, int *bank);
 
 typedef struct mem_ioreg_list_s {
     const char *name;

Modified: branches/marco/ports/vice/src/monitor/monitor.c
===================================================================
--- branches/marco/ports/vice/src/monitor/monitor.c	2008-06-30 07:13:13 UTC (rev 18938)
+++ branches/marco/ports/vice/src/monitor/monitor.c	2008-06-30 23:41:44 UTC (rev 18939)
@@ -1038,8 +1038,9 @@
     WORD base;
     BYTE rows, cols;
     unsigned int r, c;
+    int bank;
 
-    mem_get_screen_parameter(&base, &rows, &cols);
+    mem_get_screen_parameter(&base, &rows, &cols, &bank);
     for (r = 0; r < rows; r++) {
         for (c = 0; c < cols; c++) {
             BYTE data;

Modified: branches/marco/ports/vice/src/pet/petmem.c
===================================================================
--- branches/marco/ports/vice/src/pet/petmem.c	2008-06-30 07:13:13 UTC (rev 18938)
+++ branches/marco/ports/vice/src/pet/petmem.c	2008-06-30 23:41:44 UTC (rev 18939)
@@ -946,7 +946,7 @@
     return mem_ioreg_list;
 }
 
-void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns)
+void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns, int *bank)
 {
     int cols;
 
@@ -955,6 +955,7 @@
     *base = 0x8000;
     *rows = 25;
     *columns = (BYTE)cols;
+    *bank = 0;
 }
 
 /*-----------------------------------------------------------------------*/

Modified: branches/marco/ports/vice/src/plus4/plus4mem.c
===================================================================
--- branches/marco/ports/vice/src/plus4/plus4mem.c	2008-06-30 07:13:13 UTC (rev 18938)
+++ branches/marco/ports/vice/src/plus4/plus4mem.c	2008-06-30 23:41:44 UTC (rev 18939)
@@ -1056,10 +1056,11 @@
     return mem_ioreg_list;
 }
 
-void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns)
+void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns, int *bank)
 {
     *base = (ted_peek(0xff14) & 0xf8) << 8 | 0x400;
     *rows = 25;
     *columns = 40;
+    *bank = 0;
 }
 

Modified: branches/marco/ports/vice/src/vic20/vic20mem.c
===================================================================
--- branches/marco/ports/vice/src/vic20/vic20mem.c	2008-06-30 07:13:13 UTC (rev 18938)
+++ branches/marco/ports/vice/src/vic20/vic20mem.c	2008-06-30 23:41:44 UTC (rev 18939)
@@ -819,11 +819,12 @@
     return mem_ioreg_list;
 }
 
-void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns)
+void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns, int *bank)
 {
     *base = ((vic_peek(0x9005) & 0x80) ? 0 : 0x8000) + ((vic_peek(0x9005) & 0x70) << 6) + ((vic_peek(0x9002) & 0x80) << 2);
     *rows = (vic_peek(0x9003) & 0x7e) >> 1;
     *columns = vic_peek(0x9002) & 0x7f;
+    *bank = 0;
 }
 
 /************************************************************************/


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

[Vice-emu-commit] SF.net SVN: vice-emu: [18938] tags/marco/v1.22. 21-hu-intl-win32sc-makebindist/

From: <bla...@us...> - 2008-06-30 07:13:04

Revision: 18938
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18938&view=rev
Author:   blackystardust
Date:     2008-06-30 00:13:13 -0700 (Mon, 30 Jun 2008)

Log Message:
-----------
Tagged my latest changes

Added Paths:
-----------
    tags/marco/v1.22.21-hu-intl-win32sc-makebindist/

Copied: tags/marco/v1.22.21-hu-intl-win32sc-makebindist (from rev 18937, branches/marco/ports)


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

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

From: <bla...@us...> - 2008-06-30 04:41:31

Revision: 18937
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18937&view=rev
Author:   blackystardust
Date:     2008-06-29 21:41:40 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
Added the missing vic_peek() function (why was it in vic-mem.h if it did not exist ??), and corrected a missing shift.

Modified Paths:
--------------
    branches/marco/ports/vice/src/vic20/vic-mem.c
    branches/marco/ports/vice/src/vic20/vic20mem.c

Modified: branches/marco/ports/vice/src/vic20/vic-mem.c
===================================================================
--- branches/marco/ports/vice/src/vic20/vic-mem.c	2008-06-30 03:23:45 UTC (rev 18936)
+++ branches/marco/ports/vice/src/vic20/vic-mem.c	2008-06-30 04:41:40 UTC (rev 18937)
@@ -346,8 +346,6 @@
     }
 }
 
-
-
 BYTE REGPARM1 vic_read(WORD addr)
 {
     addr &= 0xf;
@@ -367,3 +365,12 @@
     }
 }
 
+/* This function is only used by mem_get_screen_parameter(),
+   so all we return is the regs. Change this if it ever gets
+   used for other things. */
+BYTE REGPARM1 vic_peek(WORD addr)
+{
+    addr &= 0xf;
+
+    return vic.regs[addr];
+}

Modified: branches/marco/ports/vice/src/vic20/vic20mem.c
===================================================================
--- branches/marco/ports/vice/src/vic20/vic20mem.c	2008-06-30 03:23:45 UTC (rev 18936)
+++ branches/marco/ports/vice/src/vic20/vic20mem.c	2008-06-30 04:41:40 UTC (rev 18937)
@@ -822,8 +822,8 @@
 void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns)
 {
     *base = ((vic_peek(0x9005) & 0x80) ? 0 : 0x8000) + ((vic_peek(0x9005) & 0x70) << 6) + ((vic_peek(0x9002) & 0x80) << 2);
-    *rows = vic_peek(0x9003) & 0x7e;
-    *columns = vic_peek(0x9002) & 0xfe;
+    *rows = (vic_peek(0x9003) & 0x7e) >> 1;
+    *columns = vic_peek(0x9002) & 0x7f;
 }
 
 /************************************************************************/


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

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

From: <bla...@us...> - 2008-06-30 03:23:37

Revision: 18936
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18936&view=rev
Author:   blackystardust
Date:     2008-06-29 20:23:45 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
Fixed the pet and vic20 mem_get_screen_parameter() and extended the copy/paste text to the other languages.

Modified Paths:
--------------
    branches/marco/ports/vice/src/arch/win32/resc128.rc
    branches/marco/ports/vice/src/arch/win32/resc64.rc
    branches/marco/ports/vice/src/arch/win32/rescbm2.rc
    branches/marco/ports/vice/src/arch/win32/respet.rc
    branches/marco/ports/vice/src/arch/win32/resplus4.rc
    branches/marco/ports/vice/src/arch/win32/resvic20.rc
    branches/marco/ports/vice/src/pet/petmem.c
    branches/marco/ports/vice/src/vic20/vic20mem.c

Modified: branches/marco/ports/vice/src/arch/win32/resc128.rc
===================================================================
--- branches/marco/ports/vice/src/arch/win32/resc128.rc	2008-06-29 22:07:51 UTC (rev 18935)
+++ branches/marco/ports/vice/src/arch/win32/resc128.rc	2008-06-30 03:23:45 UTC (rev 18936)
@@ -400,6 +400,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Snapshot &Image Laden...", IDM_SNAPSHOT_LOAD
@@ -666,6 +671,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Quitter", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Sauvegarde"
     BEGIN
         MENUITEM "C&harger une sauvegarde....", IDM_SNAPSHOT_LOAD
@@ -933,6 +943,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Kil\xE9p\xE9s", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Pillanatk\xE9p"
     BEGIN
         MENUITEM "Pillanatk\xE9p &bet\xF6lt\xE9se...",          IDM_SNAPSHOT_LOAD
@@ -1200,6 +1215,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&sci", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Carica &immagine dello snapshot...", IDM_SNAPSHOT_LOAD
@@ -1466,6 +1486,11 @@
         MENUITEM SEPARATOR
         MENUITEM "Af&sluiten", IDM_EXIT
     END
+    POPUP "&Bewerken"
+    BEGIN
+        MENUITEM "&Kopie", IDM_EDIT_COPY
+        MENUITEM "&Plakken", IDM_EDIT_PASTE
+    END
     POPUP "Momento&pname"
     BEGIN
         MENUITEM "Laad momentopnamebest&and...",          IDM_SNAPSHOT_LOAD
@@ -1733,6 +1758,11 @@
         MENUITEM SEPARATOR
         MENUITEM "W&yjd\xBC", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "z&rzutu"
     BEGIN
         MENUITEM "Za\xB3adu&j zrzut...", IDM_SNAPSHOT_LOAD
@@ -2000,6 +2030,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Avsluta", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&\xD6gonblicksbild"
     BEGIN
         MENUITEM "&L\xE4s in \xF6gonblicksbild...", IDM_SNAPSHOT_LOAD

Modified: branches/marco/ports/vice/src/arch/win32/resc64.rc
===================================================================
--- branches/marco/ports/vice/src/arch/win32/resc64.rc	2008-06-29 22:07:51 UTC (rev 18935)
+++ branches/marco/ports/vice/src/arch/win32/resc64.rc	2008-06-30 03:23:45 UTC (rev 18936)
@@ -397,6 +397,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Snapshot &Image Laden...", IDM_SNAPSHOT_LOAD
@@ -660,6 +665,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Quitter", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Sauvegarde"
     BEGIN
         MENUITEM "C&harger une sauvegarde....", IDM_SNAPSHOT_LOAD
@@ -924,6 +934,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Kil\xE9p\xE9s", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Pillanatk\xE9p"
     BEGIN
         MENUITEM "Pillanatk\xE9p &bet\xF6lt\xE9se...",          IDM_SNAPSHOT_LOAD
@@ -1188,6 +1203,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&sci", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Carica &immagine dello snapshot...", IDM_SNAPSHOT_LOAD
@@ -1451,6 +1471,11 @@
         MENUITEM SEPARATOR
         MENUITEM "Af&sluiten", IDM_EXIT
     END
+    POPUP "&Bewerken"
+    BEGIN
+        MENUITEM "&Kopie", IDM_EDIT_COPY
+        MENUITEM "&Plakken", IDM_EDIT_PASTE
+    END
     POPUP "Momento&pname"
     BEGIN
         MENUITEM "Laad momentopnamebest&and...", IDM_SNAPSHOT_LOAD
@@ -1715,6 +1740,11 @@
         MENUITEM SEPARATOR
         MENUITEM "W&yjd\xBC", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "z&rzutu"
     BEGIN
         MENUITEM "Za\xB3adu&j zrzut...", IDM_SNAPSHOT_LOAD
@@ -1979,6 +2009,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Avsluta", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&\xD6gonblicksbild"
     BEGIN
         MENUITEM "&L\xE4s in \xF6gonblicksbild...", IDM_SNAPSHOT_LOAD

Modified: branches/marco/ports/vice/src/arch/win32/rescbm2.rc
===================================================================
--- branches/marco/ports/vice/src/arch/win32/rescbm2.rc	2008-06-29 22:07:51 UTC (rev 18935)
+++ branches/marco/ports/vice/src/arch/win32/rescbm2.rc	2008-06-30 03:23:45 UTC (rev 18936)
@@ -317,6 +317,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Snapshot &Image Laden...",          IDM_SNAPSHOT_LOAD
@@ -531,6 +536,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Quitter", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Sauvegarde"
     BEGIN
         MENUITEM "C&harger une sauvegarde....",          IDM_SNAPSHOT_LOAD
@@ -748,6 +758,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Kil\xE9p\xE9s", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Pillanatk\xE9p"
     BEGIN
         MENUITEM "Pillanatk\xE9p &bet\xF6lt\xE9se...",          IDM_SNAPSHOT_LOAD
@@ -963,6 +978,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&sci", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Carica &immagine dello snapshot...",          IDM_SNAPSHOT_LOAD
@@ -1179,6 +1199,11 @@
         MENUITEM SEPARATOR
         MENUITEM "Af&sluiten", IDM_EXIT
     END
+    POPUP "&Bewerken"
+    BEGIN
+        MENUITEM "&Kopie", IDM_EDIT_COPY
+        MENUITEM "&Plakken", IDM_EDIT_PASTE
+    END
     POPUP "Momento&pname"
     BEGIN
         MENUITEM "Laad momentopnamebest&and...",          IDM_SNAPSHOT_LOAD
@@ -1396,6 +1421,11 @@
         MENUITEM SEPARATOR
         MENUITEM "W&yjd\xBC", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "z&rzutu"
     BEGIN
         MENUITEM "Za\xB3adu&j zrzut...",          IDM_SNAPSHOT_LOAD
@@ -1611,6 +1641,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Avsluta", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&\xD6gonblicksbild"
     BEGIN
         MENUITEM "&L\xE4s in \xF6gonblicksbild...",          IDM_SNAPSHOT_LOAD

Modified: branches/marco/ports/vice/src/arch/win32/respet.rc
===================================================================
--- branches/marco/ports/vice/src/arch/win32/respet.rc	2008-06-29 22:07:51 UTC (rev 18935)
+++ branches/marco/ports/vice/src/arch/win32/respet.rc	2008-06-30 03:23:45 UTC (rev 18936)
@@ -313,6 +313,11 @@
        MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Snapshot &Image Laden...", IDM_SNAPSHOT_LOAD
@@ -525,6 +530,11 @@
        MENUITEM SEPARATOR
         MENUITEM "&Quitter", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Sauvegarde"
     BEGIN
         MENUITEM "C&harger une sauvegarde....", IDM_SNAPSHOT_LOAD
@@ -738,6 +748,11 @@
        MENUITEM SEPARATOR
         MENUITEM "&Kil\xE9p\xE9s", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Pillanatk\xE9p"
     BEGIN
         MENUITEM "Pillanatk\xE9p &bet\xF6lt\xE9se...", IDM_SNAPSHOT_LOAD
@@ -951,6 +966,11 @@
        MENUITEM SEPARATOR
         MENUITEM "E&sci", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Carica &immagine dello snapshot...", IDM_SNAPSHOT_LOAD
@@ -1163,6 +1183,11 @@
        MENUITEM SEPARATOR
         MENUITEM "Af&sluiten", IDM_EXIT
     END
+    POPUP "&Bewerken"
+    BEGIN
+        MENUITEM "&Kopie", IDM_EDIT_COPY
+        MENUITEM "&Plakken", IDM_EDIT_PASTE
+    END
     POPUP "Momento&pname"
     BEGIN
         MENUITEM "Laad momentopnamebest&and...", IDM_SNAPSHOT_LOAD
@@ -1376,6 +1401,11 @@
        MENUITEM SEPARATOR
         MENUITEM "W&yjd\xBC", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "z&rzutu"
     BEGIN
         MENUITEM "Za\xB3adu&j zrzut...", IDM_SNAPSHOT_LOAD
@@ -1589,6 +1619,11 @@
        MENUITEM SEPARATOR
         MENUITEM "&Avsluta", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&\xD6gonblicksbild"
     BEGIN
         MENUITEM "&L\xE4s in \xF6gonblicksbild...", IDM_SNAPSHOT_LOAD

Modified: branches/marco/ports/vice/src/arch/win32/resplus4.rc
===================================================================
--- branches/marco/ports/vice/src/arch/win32/resplus4.rc	2008-06-29 22:07:51 UTC (rev 18935)
+++ branches/marco/ports/vice/src/arch/win32/resplus4.rc	2008-06-30 03:23:45 UTC (rev 18936)
@@ -343,6 +343,11 @@
        MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Snapshot &Image Laden...", IDM_SNAPSHOT_LOAD
@@ -573,6 +578,11 @@
        MENUITEM SEPARATOR
         MENUITEM "&Quitter", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Sauvegarde"
     BEGIN
         MENUITEM "C&harger une sauvegarde....", IDM_SNAPSHOT_LOAD
@@ -804,6 +814,11 @@
        MENUITEM SEPARATOR
         MENUITEM "&Kil\xE9p\xE9s", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Pillanatk\xE9p"
     BEGIN
         MENUITEM "Pillanatk\xE9p &bet\xF6lt\xE9se...", IDM_SNAPSHOT_LOAD
@@ -1035,6 +1050,11 @@
        MENUITEM SEPARATOR
         MENUITEM "E&sci", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Carica &immagine dello snapshot...", IDM_SNAPSHOT_LOAD
@@ -1265,6 +1285,11 @@
        MENUITEM SEPARATOR
         MENUITEM "Af&sluiten", IDM_EXIT
     END
+    POPUP "&Bewerken"
+    BEGIN
+        MENUITEM "&Kopie", IDM_EDIT_COPY
+        MENUITEM "&Plakken", IDM_EDIT_PASTE
+    END
     POPUP "Momento&pname"
     BEGIN
         MENUITEM "Laad momentopnamebest&and...", IDM_SNAPSHOT_LOAD
@@ -1496,6 +1521,11 @@
        MENUITEM SEPARATOR
         MENUITEM "W&yjd\xBC", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "z&rzutu"
     BEGIN
         MENUITEM "Za\xB3adu&j zrzut...", IDM_SNAPSHOT_LOAD
@@ -1727,6 +1757,11 @@
        MENUITEM SEPARATOR
         MENUITEM "&Avsluta", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&\xD6gonblicksbild"
     BEGIN
         MENUITEM "&L\xE4s in \xF6gonblicksbild...", IDM_SNAPSHOT_LOAD

Modified: branches/marco/ports/vice/src/arch/win32/resvic20.rc
===================================================================
--- branches/marco/ports/vice/src/arch/win32/resvic20.rc	2008-06-29 22:07:51 UTC (rev 18935)
+++ branches/marco/ports/vice/src/arch/win32/resvic20.rc	2008-06-30 03:23:45 UTC (rev 18936)
@@ -341,6 +341,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Snapshot &Image Laden...",  IDM_SNAPSHOT_LOAD
@@ -571,6 +576,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Quitter", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Sauvegarde"
     BEGIN
         MENUITEM "C&harger une sauvegarde....",  IDM_SNAPSHOT_LOAD
@@ -802,6 +812,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Kil\xE9p\xE9s", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&Pillanatk\xE9p"
     BEGIN
         MENUITEM "Pillanatk\xE9p &bet\xF6lt\xE9se...",  IDM_SNAPSHOT_LOAD
@@ -1033,6 +1048,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&sci", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Carica &immagine dello snapshot...",  IDM_SNAPSHOT_LOAD
@@ -1263,6 +1283,11 @@
         MENUITEM SEPARATOR
         MENUITEM "Af&sluiten", IDM_EXIT
     END
+    POPUP "&Bewerken"
+    BEGIN
+        MENUITEM "&Kopie", IDM_EDIT_COPY
+        MENUITEM "&Plakken", IDM_EDIT_PASTE
+    END
     POPUP "Momento&pname"
     BEGIN
         MENUITEM "Laad momentopnamebest&and...",  IDM_SNAPSHOT_LOAD
@@ -1494,6 +1519,11 @@
         MENUITEM SEPARATOR
         MENUITEM "W&yjd\xBC", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "z&rzutu"
     BEGIN
         MENUITEM "Za\xB3adu&j zrzut...",  IDM_SNAPSHOT_LOAD
@@ -1725,6 +1755,11 @@
         MENUITEM SEPARATOR
         MENUITEM "&Avsluta", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "&\xD6gonblicksbild"
     BEGIN
         MENUITEM "&L\xE4s in \xF6gonblicksbild...",  IDM_SNAPSHOT_LOAD

Modified: branches/marco/ports/vice/src/pet/petmem.c
===================================================================
--- branches/marco/ports/vice/src/pet/petmem.c	2008-06-29 22:07:51 UTC (rev 18935)
+++ branches/marco/ports/vice/src/pet/petmem.c	2008-06-30 03:23:45 UTC (rev 18936)
@@ -948,10 +948,13 @@
 
 void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns)
 {
-    /* FIXME */
-    *base = 0;
+    int cols;
+
+    resources_get_int("VideoSize", &cols);
+
+    *base = 0x8000;
     *rows = 25;
-    *columns = 80;
+    *columns = (BYTE)cols;
 }
 
 /*-----------------------------------------------------------------------*/

Modified: branches/marco/ports/vice/src/vic20/vic20mem.c
===================================================================
--- branches/marco/ports/vice/src/vic20/vic20mem.c	2008-06-29 22:07:51 UTC (rev 18935)
+++ branches/marco/ports/vice/src/vic20/vic20mem.c	2008-06-30 03:23:45 UTC (rev 18936)
@@ -821,10 +821,9 @@
 
 void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns)
 {
-    /* FIXME */
-    *base = 0x1000;
-    *rows = 23;
-    *columns = 22;
+    *base = ((vic_peek(0x9005) & 0x80) ? 0 : 0x8000) + ((vic_peek(0x9005) & 0x70) << 6) + ((vic_peek(0x9002) & 0x80) << 2);
+    *rows = vic_peek(0x9003) & 0x7e;
+    *columns = vic_peek(0x9002) & 0xfe;
 }
 
 /************************************************************************/


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

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

From: <bla...@us...> - 2008-06-29 22:07:45

Revision: 18935
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18935&view=rev
Author:   blackystardust
Date:     2008-06-29 15:07:51 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
Updated to 1.22.21

Modified Paths:
--------------
    branches/marco/ports/vice/ChangeLog
    branches/marco/ports/vice/Doxyfile
    branches/marco/ports/vice/configure.in
    branches/marco/ports/vice/data/C128/win_shortcuts.vsc
    branches/marco/ports/vice/data/C64/win_shortcuts.vsc
    branches/marco/ports/vice/data/CBM-II/win_shortcuts.vsc
    branches/marco/ports/vice/data/PET/win_shortcuts.vsc
    branches/marco/ports/vice/data/PLUS4/win_shortcuts.vsc
    branches/marco/ports/vice/data/VIC20/win_shortcuts.vsc
    branches/marco/ports/vice/doc/html/plain/NEWS
    branches/marco/ports/vice/src/ChangeLog
    branches/marco/ports/vice/src/arch/win32/resc128.rc
    branches/marco/ports/vice/src/arch/win32/resc64.rc
    branches/marco/ports/vice/src/arch/win32/rescbm2.rc
    branches/marco/ports/vice/src/arch/win32/resmenu.txt
    branches/marco/ports/vice/src/arch/win32/respet.rc
    branches/marco/ports/vice/src/arch/win32/resplus4.rc
    branches/marco/ports/vice/src/arch/win32/resvic20.rc
    branches/marco/ports/vice/src/arch/win32/ui.c
    branches/marco/ports/vice/src/arch/win32/vice.dsw
    branches/marco/ports/vice/src/autostart.c
    branches/marco/ports/vice/src/c64/reu.c
    branches/marco/ports/vice/src/version.h

Added Paths:
-----------
    branches/marco/ports/vice/src/arch/win32/_all.dsp

Modified: branches/marco/ports/vice/ChangeLog
===================================================================
--- branches/marco/ports/vice/ChangeLog	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/ChangeLog	2008-06-29 22:07:51 UTC (rev 18935)
@@ -1,3 +1,16 @@
+2008-06-29  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.21
+
+2008-06-28  Spiro Trikaliotis  <spi...@gm...>
+
+	* data/CBM-II/win_shortcuts.vsc, data/VIC20/win_shortcuts.vsc,
+	data/PLUS4/win_shortcuts.vsc, data/PET/win_shortcuts.vsc,
+	data/C64/win_shortcuts.vsc, data/C128/win_shortcuts.vsc: Set
+	default shortcuts Ctrl+C and Ctrl+V for Edit/Copy and Edit/Paste
+
+	* doc/html/plain/NEWS: Updated
+
 2008-06-23  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.20

Modified: branches/marco/ports/vice/Doxyfile
===================================================================
--- branches/marco/ports/vice/Doxyfile	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/Doxyfile	2008-06-29 22:07:51 UTC (rev 18935)
@@ -519,7 +519,7 @@
 # Note: To get rid of all source code in the generated output, make sure also 
 # VERBATIM_HEADERS is set to NO.
 
-SOURCE_BROWSER         = YES
+SOURCE_BROWSER         = NO
 
 # Setting the INLINE_SOURCES tag to YES will include the body 
 # of functions and classes directly in the documentation.

Modified: branches/marco/ports/vice/configure.in
===================================================================
--- branches/marco/ports/vice/configure.in	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/configure.in	2008-06-29 22:07:51 UTC (rev 18935)
@@ -9,7 +9,7 @@
 
 VICE_VERSION_MAJOR=1
 VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=20
+VICE_VERSION_BUILD=21
 
 AC_SUBST(VICE_VERSION_MAJOR)
 AC_SUBST(VICE_VERSION_MINOR)

Modified: branches/marco/ports/vice/data/C128/win_shortcuts.vsc
===================================================================
--- branches/marco/ports/vice/data/C128/win_shortcuts.vsc	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/data/C128/win_shortcuts.vsc	2008-06-29 22:07:51 UTC (rev 18935)
@@ -47,3 +47,7 @@
 ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
 ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
 ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
+
+CTRL        'C'         IDM_EDIT_COPY
+CTRL        'V'         IDM_EDIT_PASTE
+CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT

Modified: branches/marco/ports/vice/data/C64/win_shortcuts.vsc
===================================================================
--- branches/marco/ports/vice/data/C64/win_shortcuts.vsc	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/data/C64/win_shortcuts.vsc	2008-06-29 22:07:51 UTC (rev 18935)
@@ -47,3 +47,7 @@
 ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
 ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
 ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
+
+CTRL        'C'         IDM_EDIT_COPY
+CTRL        'V'         IDM_EDIT_PASTE
+CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT

Modified: branches/marco/ports/vice/data/CBM-II/win_shortcuts.vsc
===================================================================
--- branches/marco/ports/vice/data/CBM-II/win_shortcuts.vsc	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/data/CBM-II/win_shortcuts.vsc	2008-06-29 22:07:51 UTC (rev 18935)
@@ -47,3 +47,7 @@
 ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
 ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
 ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
+
+CTRL        'C'         IDM_EDIT_COPY
+CTRL        'V'         IDM_EDIT_PASTE
+CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT

Modified: branches/marco/ports/vice/data/PET/win_shortcuts.vsc
===================================================================
--- branches/marco/ports/vice/data/PET/win_shortcuts.vsc	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/data/PET/win_shortcuts.vsc	2008-06-29 22:07:51 UTC (rev 18935)
@@ -47,3 +47,7 @@
 ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
 ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
 ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
+
+CTRL        'C'         IDM_EDIT_COPY
+CTRL        'V'         IDM_EDIT_PASTE
+CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT

Modified: branches/marco/ports/vice/data/PLUS4/win_shortcuts.vsc
===================================================================
--- branches/marco/ports/vice/data/PLUS4/win_shortcuts.vsc	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/data/PLUS4/win_shortcuts.vsc	2008-06-29 22:07:51 UTC (rev 18935)
@@ -47,3 +47,7 @@
 ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
 ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
 ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
+
+CTRL        'C'         IDM_EDIT_COPY
+CTRL        'V'         IDM_EDIT_PASTE
+CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT

Modified: branches/marco/ports/vice/data/VIC20/win_shortcuts.vsc
===================================================================
--- branches/marco/ports/vice/data/VIC20/win_shortcuts.vsc	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/data/VIC20/win_shortcuts.vsc	2008-06-29 22:07:51 UTC (rev 18935)
@@ -47,3 +47,7 @@
 ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
 ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
 ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
+
+CTRL        'C'         IDM_EDIT_COPY
+CTRL        'V'         IDM_EDIT_PASTE
+CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT

Modified: branches/marco/ports/vice/doc/html/plain/NEWS
===================================================================
--- branches/marco/ports/vice/doc/html/plain/NEWS	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/doc/html/plain/NEWS	2008-06-29 22:07:51 UTC (rev 18935)
@@ -39,6 +39,8 @@
 
 - Added support for the Action Replay 4 and StarDos cartridges.
 
+- Improved REU compatibility
+
 ** VIC20 changes
 ----------------
 
@@ -82,6 +84,9 @@
 - Fixed the reverse logic of the -confirmexit/+confirmexit and
   -singlecpu/+singlecpu command-line options.
 
+- allow for pasting into the VICE window: Either via menu
+  (Edit/Paste), or by right-clicking on the VICE window.
+
 ** BeOS changes
 ---------------
 
@@ -115,6 +120,7 @@
 - New memmap feature which allows tracking of memory accesses,
   activated by the configure option --enable-memmap.
 
+
 * Changes in VICE 1.22
 ======================
 

Modified: branches/marco/ports/vice/src/ChangeLog
===================================================================
--- branches/marco/ports/vice/src/ChangeLog	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/src/ChangeLog	2008-06-29 22:07:51 UTC (rev 18935)
@@ -1,3 +1,56 @@
+2008-06-29  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.21
+
+2008-06-29  Spiro Trikaliotis  <spi...@gm...>
+
+	* arch/win32/ui.c: Add copy to clipboard for the text screen.
+	All emulators which support the monitor "screen" command are
+	supported, that is: x64, xplus4, xvic, x128 in VIC-II mode.
+	xcbm2 and xpet are not supported, as their base video addresses
+	are not given with mem_get_screen_parameter(). New functions
+	read_screen_output(), ui_copy_clipboard().
+
+2008-06-28  Spiro Trikaliotis  <spi...@gm...>
+
+	* arch/win32/rescbm2.rc, arch/win32/resplus4.rc,
+	arch/win32/resmenu.txt, arch/win32/ui.c, arch/win32/resvic20.rc,
+	arch/win32/resc128.rc, arch/win32/resc64.rc,
+	arch/win32/respet.rc: Removed IDM_EDIT_CUT (how should we cut
+	something from the VICE window? Does not make much sense, does
+	it?
+
+	* arch/win32/ui.c: Added paste function to paste from clipboard
+	to the VICE keyboard buffer. It is selected either via menu
+	(Edit/Paste), or via right-click on the VICE window.
+
+	* arch/win32/resmenu.txt, arch/win32/rescbm2.rc,
+	arch/win32/resplus4.rc, arch/win32/resmenu.txt,
+	arch/win32/resvic20.rc, arch/win32/resc128.rc,
+	arch/win32/resc64.rc, arch/win32/respet.rc: Added IDM_EDIT_CUT,
+	IDM_EDIT_COPY and IDM_EDIT_PASTE.
+
+2008-06-27  Spiro Trikaliotis  <spi...@gm...>
+
+	* autostart.c: Incorporated patch from iAN Coog: 1. Add colon
+	(":") after "LOAD" and "RUN" lines used to start. This is
+	helpful if there is already something on the screen, to prevent
+	it to provoke some error messages. 2. remember original true
+	drive emulation state before using autostart. This fixes the
+	problem that TDE is not re-activated after autostart.  3. Dev
+	Traps set to ON always in autostart_tape() for T64s. T64 without
+	VTD don't load, so it's a must to activate it always with them.
+	(TAP files don't care.)
+
+2008-06-25  Spiro Trikaliotis  <spi...@gm...>
+
+	* arch/win32/vice.dsw, arch/win32/_all.dsp: New (dummy) project
+	_all.
+
+	* c64/reu.c: Fixed problems with bank register not masking out
+	unused bits, and autoload option which has to copy the shadow
+	registers back. Fixed doxygen a little.
+
 2008-06-23  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.20
@@ -429,10 +482,10 @@
 
 2008-05-18  Spiro Trikaliotis  <spi...@gm...>
 
-	* src/arch/win32/signals.c: break64() now has a full backup text
-	in case translate_text() fails. This prevents empty dialog boxes
-	in the case of an error, which occurs rather frequently on
-	Windows, as these calls fail.
+	* arch/win32/signals.c: break64() now has a full backup text in
+	case translate_text() fails. This prevents empty dialog boxes in
+	the case of an error, which occurs rather frequently on Windows,
+	as these calls fail.
 
 2008-05-18  Spiro Trikaliotis  <spi...@gm...>
 
@@ -544,8 +597,8 @@
 
 2008-04-19  Greg King  <gre...@ve...>
 
-	* src/c64/cart/ide64.c: adds a working RTC to the emulation of
-	the IDE64 cartridge.
+	* c64/cart/ide64.c: adds a working RTC to the emulation of the
+	IDE64 cartridge.
 
 2008-04-19  Spiro Trikaliotis  <spi...@gm...>
 
@@ -675,10 +728,10 @@
 	* arch/unix/x11/gnome/x11ui.c: Do not exit the program if HW
 	scaling not available at runtime.
 
-	* video/video-resources.c, src/video.h: Move resources vars
-	from video_resource_chip_t to video_render_config_t, which
-	were often unnecessarily duplicated, and made modification of
-	resources a nightmare.
+	* video/video-resources.c, video.h: Move resources vars from
+	video_resource_chip_t to video_render_config_t, which were often
+	unnecessarily duplicated, and made modification of resources a
+	nightmare.
 
 	* video/video-resources.c: Add resource HwScalePossible, to
 	enable/disable HW scaling menu entry.
@@ -2486,9 +2539,8 @@
 
 2007-01-21  Spiro Trikaliotis  <Spi...@gm...>
 
-	* ioutil.c, src/ioutil.h: Changed prototype of
-	ioutil_maxpathlen() to return an unsigned int in order to
-	remove warnings.
+	* ioutil.c, ioutil.h: Changed prototype of ioutil_maxpathlen()
+	to return an unsigned int in order to remove warnings.
 
 2007-01-21  Spiro Trikaliotis  <Spi...@gm...>
 

Copied: branches/marco/ports/vice/src/arch/win32/_all.dsp (from rev 18934, tags/v1.22/v1.22.21/vice/src/arch/win32/_all.dsp)
===================================================================
--- branches/marco/ports/vice/src/arch/win32/_all.dsp	                        (rev 0)
+++ branches/marco/ports/vice/src/arch/win32/_all.dsp	2008-06-29 22:07:51 UTC (rev 18935)
@@ -0,0 +1,89 @@
+# Microsoft Developer Studio Project File - Name="_all" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=_all - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "_all.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "_all.mak" CFG="_all - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "_all - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "_all - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "_all - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+
+!ELSEIF  "$(CFG)" == "_all - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "_all - Win32 Release"
+# Name "_all - Win32 Debug"
+# End Target
+# End Project

Modified: branches/marco/ports/vice/src/arch/win32/resc128.rc
===================================================================
--- branches/marco/ports/vice/src/arch/win32/resc128.rc	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/src/arch/win32/resc128.rc	2008-06-29 22:07:51 UTC (rev 18935)
@@ -127,6 +127,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Load snapshot &image...",          IDM_SNAPSHOT_LOAD

Modified: branches/marco/ports/vice/src/arch/win32/resc64.rc
===================================================================
--- branches/marco/ports/vice/src/arch/win32/resc64.rc	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/src/arch/win32/resc64.rc	2008-06-29 22:07:51 UTC (rev 18935)
@@ -127,6 +127,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Load snapshot &image...",          IDM_SNAPSHOT_LOAD

Modified: branches/marco/ports/vice/src/arch/win32/rescbm2.rc
===================================================================
--- branches/marco/ports/vice/src/arch/win32/rescbm2.rc	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/src/arch/win32/rescbm2.rc	2008-06-29 22:07:51 UTC (rev 18935)
@@ -96,6 +96,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Load snapshot &image...",          IDM_SNAPSHOT_LOAD

Modified: branches/marco/ports/vice/src/arch/win32/resmenu.txt
===================================================================
--- branches/marco/ports/vice/src/arch/win32/resmenu.txt	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/src/arch/win32/resmenu.txt	2008-06-29 22:07:51 UTC (rev 18935)
@@ -59,6 +59,8 @@
 IDM_EXIT
 IDM_ABOUT
 IDM_PAUSE
+IDM_EDIT_COPY
+IDM_EDIT_PASTE
 IDM_SINGLE_FRAME_ADVANCE
 IDM_AUTOSTART
 IDM_RESET_HARD

Modified: branches/marco/ports/vice/src/arch/win32/respet.rc
===================================================================
--- branches/marco/ports/vice/src/arch/win32/respet.rc	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/src/arch/win32/respet.rc	2008-06-29 22:07:51 UTC (rev 18935)
@@ -94,6 +94,11 @@
        MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Load snapshot &image...", IDM_SNAPSHOT_LOAD

Modified: branches/marco/ports/vice/src/arch/win32/resplus4.rc
===================================================================
--- branches/marco/ports/vice/src/arch/win32/resplus4.rc	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/src/arch/win32/resplus4.rc	2008-06-29 22:07:51 UTC (rev 18935)
@@ -106,6 +106,11 @@
        MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Load snapshot &image...", IDM_SNAPSHOT_LOAD

Modified: branches/marco/ports/vice/src/arch/win32/resvic20.rc
===================================================================
--- branches/marco/ports/vice/src/arch/win32/resvic20.rc	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/src/arch/win32/resvic20.rc	2008-06-29 22:07:51 UTC (rev 18935)
@@ -104,6 +104,11 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Load snapshot &image...",  IDM_SNAPSHOT_LOAD

Modified: branches/marco/ports/vice/src/arch/win32/ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/win32/ui.c	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/src/arch/win32/ui.c	2008-06-29 22:07:51 UTC (rev 18935)
@@ -28,6 +28,7 @@
 
 #include "vice.h"
 
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <windows.h>
@@ -40,6 +41,7 @@
 #include "attach.h"
 #include "autostart.h"
 #include "archdep.h"
+#include "charset.h"
 #include "debug.h"
 #include "drive.h"
 #include "drivecpu.h"
@@ -49,6 +51,7 @@
 #include "interrupt.h"
 #include "intl.h"
 #include "kbd.h"
+#include "kbdbuf.h"
 #include "lib.h"
 #include "log.h"
 #include "machine.h"
@@ -980,6 +983,182 @@
 
 /* ------------------------------------------------------------------------ */
 
+static char * read_screen_output(void)
+{
+    char * outputbuffer = NULL;
+
+    do {
+        WORD base;
+        BYTE allrows, allcols;
+        unsigned int row, col;
+        unsigned int size;
+        char * p;
+
+        mem_get_screen_parameter(&base, &allrows, &allcols);
+
+        size = allrows * (allcols + 2) + 1;
+
+        outputbuffer = lib_malloc(size);
+        if (outputbuffer == NULL) {
+            break;
+        }
+
+        p = outputbuffer;
+
+        for (row = 0; row < allrows; row++) {
+            char * last_non_whitespace = p - 1;
+
+            for (col = 0; col < allcols; col++) {
+                BYTE data;
+
+                data = mem_bank_peek(0, base++, NULL);
+                data = charset_p_toascii(charset_screencode_to_petcii(data), 1);
+
+                if (data != ' ') {
+                    last_non_whitespace = p;
+                }
+                *p++ = data;
+            }
+
+            /* trim the line if there are only whitespace at the end */
+
+            if (last_non_whitespace < p) {
+                p = last_non_whitespace + 1;
+            }
+
+            /* add a CR/LF */
+
+            *p++ = '\r';
+            *p++ = '\n';
+        }
+
+        *p = 0;
+
+        assert(p < outputbuffer + size);
+
+    } while (0);
+
+    return outputbuffer;
+}
+
+static void ui_copy_clipboard(HWND window)
+{
+    BOOL clipboard_is_open = FALSE;
+    char * text;
+    HGLOBAL globaltext = NULL;
+
+    do {
+        char * p;
+
+        if ( ! OpenClipboard(window) ) {
+            break;
+        }
+        clipboard_is_open = TRUE;
+
+        if ( ! EmptyClipboard() ) {
+            break;
+        }
+
+        text = read_screen_output();
+        if (text == NULL) {
+            break;
+        }
+
+        globaltext = GlobalAlloc(GMEM_DDESHARE, strlen(text) + 1);
+        if (globaltext == NULL) {
+            break;
+        }
+
+        p = GlobalLock(globaltext);
+        strcpy(p, text);
+
+        SetClipboardData(CF_TEXT, globaltext);
+
+    } while (0);
+
+    if (globaltext) {
+        GlobalUnlock(globaltext);
+    }
+
+    if (text) {
+        lib_free(text);
+    }
+
+    if (clipboard_is_open) {
+        CloseClipboard();
+    }
+}
+
+static void ui_paste_clipboard_text(HWND window)
+{
+    HANDLE hdata;
+    BOOL clipboard_is_open = FALSE;
+    char * text = NULL;
+    char * text_in_petscii = NULL;
+    
+    do {
+        DWORD size;
+
+        if ( ! OpenClipboard(window) ) {
+            break;
+        }
+
+        clipboard_is_open = TRUE;
+
+        hdata = GetClipboardData(CF_TEXT);
+
+        if ( ! hdata ) {
+            break;
+        }
+
+        text = GlobalLock(hdata);
+
+        if (text == NULL) {
+            break;
+        }
+
+        size = GlobalSize(hdata);
+
+        if (size < 1) {
+            break;
+        }
+
+        /*
+         * Allocate memmory for the string to convert in petscii.
+         * Note: As we are not sure if the original text is null-terminated,
+         *       do *not* use lib_stralloc()!
+         */
+        text_in_petscii = lib_malloc(size + 1);
+
+        if (text_in_petscii == NULL) {
+            break;
+        }
+
+        memcpy(text_in_petscii, text, size);
+        text_in_petscii[size] = 0;
+
+        charset_petconvstring(text_in_petscii, 0);
+
+        kbdbuf_feed(text_in_petscii);
+
+    } while (0);
+
+    if (text_in_petscii) {
+        lib_free(text_in_petscii);
+    }
+
+    if (text) {
+        GlobalUnlock(text);
+    }
+
+    if (clipboard_is_open) {
+        CloseClipboard();
+    }
+}
+
+
+/* ------------------------------------------------------------------------ */
+
 /* FIXME: tmp hack.  */
 int syscolorchanged, displaychanged, querynewpalette, palettechanged;
 
@@ -1030,6 +1209,15 @@
     }
 }
 
+static void handle_wm_initmenupopup(HMENU menu)
+{
+    /* enable PASTE iff the clipboard contains "our" format: */
+
+    EnableMenuItem(menu, IDM_EDIT_PASTE, 
+        MF_BYCOMMAND 
+        | ( IsClipboardFormatAvailable(CF_TEXT) ? MF_ENABLED : MF_GRAYED));
+}
+
 static void handle_wm_command(WPARAM wparam, LPARAM lparam, HWND hwnd)
 {
     /* Handle machine specific commands first.  */
@@ -1045,6 +1233,12 @@
       case IDM_EXIT:
         PostMessage(hwnd, WM_CLOSE, wparam, lparam);
         break;
+      case IDM_EDIT_COPY:
+        ui_copy_clipboard(hwnd);
+        break;
+      case IDM_EDIT_PASTE:
+        ui_paste_clipboard_text(hwnd);
+        break;
       case IDM_ABOUT:
       case IDM_HELP:
       case IDM_CONTRIBUTORS:
@@ -1393,6 +1587,9 @@
           This message seems to be a good candidate for the remote desktop. */
         ui_redraw_all_windows();
         return 0;
+      case WM_INITMENUPOPUP:
+        handle_wm_initmenupopup((HMENU)wparam);
+        break;
       case WM_COMMAND:
         handle_wm_command(wparam, lparam, window);
         return 0;
@@ -1482,6 +1679,9 @@
       case WM_NCLBUTTONDOWN:
         vsync_suspend_speed_eval();
         break;
+      case WM_RBUTTONDOWN:
+        ui_paste_clipboard_text(window);
+        break;
       case WM_NOTIFY:
         statusbar_notify(window, window_index, wparam, lparam);
         break;

Modified: branches/marco/ports/vice/src/arch/win32/vice.dsw
===================================================================
--- branches/marco/ports/vice/src/arch/win32/vice.dsw	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/src/arch/win32/vice.dsw	2008-06-29 22:07:51 UTC (rev 18935)
@@ -3,6 +3,45 @@
 
 ###############################################################################
 
+Project: "_all"=".\_all.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name x64
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name x128
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name xcbm2
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name xpet
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name xplus4
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name xvic
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name petcat
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name c1541
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name cartconv
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "arch"=".\arch.dsp" - Package Owner=<4>
 
 Package=<5>

Modified: branches/marco/ports/vice/src/autostart.c
===================================================================
--- branches/marco/ports/vice/src/autostart.c	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/src/autostart.c	2008-06-29 22:07:51 UTC (rev 18935)
@@ -91,7 +91,7 @@
 
 /* Flag: was true drive emulation turned on when we started booting the disk
    image?  */
-static int orig_drive_true_emulation_state = 0;
+static int orig_drive_true_emulation_state = -1;
 
 /* PETSCII name of the program to load. NULL if default */
 static BYTE *autostart_program_name = NULL;
@@ -292,11 +292,11 @@
       case YES:
         log_message(autostart_log, "Loading file.");
         if (autostart_program_name) {
-            tmp = util_concat("LOAD\"", autostart_program_name, "\"\r", NULL);
+            tmp = util_concat("LOAD\"", autostart_program_name, "\":\r", NULL);
             kbdbuf_feed(tmp);
             lib_free(tmp);
         } else {
-            kbdbuf_feed("LOAD\r");
+            kbdbuf_feed("LOAD:\r");
         }
         if (tape_tap_attched()) {
             autostartmode = AUTOSTART_PRESSPLAYONTAPE;
@@ -333,7 +333,7 @@
     switch (check("READY.", AUTOSTART_WAIT_BLINK)) {
       case YES:
         log_message(autostart_log, "Starting program.");
-        kbdbuf_feed("RUN\r");
+        kbdbuf_feed("RUN:\r");
         autostartmode = AUTOSTART_DONE;
         break;
       case NO:
@@ -374,15 +374,15 @@
             traps = 1;
         }
         if (autostart_program_name)
-            tmp = lib_msprintf("LOAD\"%s\",8,1\r", autostart_program_name);
+            tmp = lib_msprintf("LOAD\"%s\",8,1:\r", autostart_program_name);
         else
-            tmp = lib_stralloc("LOAD\"*\",8,1\r");
+            tmp = lib_stralloc("LOAD\"*\",8,1:\r");
         kbdbuf_feed(tmp);
         lib_free(tmp);
 
         if (!traps) {
             if (autostart_run_mode == AUTOSTART_MODE_RUN)
-                kbdbuf_feed("RUN\r");
+                kbdbuf_feed("RUN:\r");
             autostartmode = AUTOSTART_DONE;
         } else {
             autostartmode = AUTOSTART_LOADINGDISK;
@@ -422,6 +422,11 @@
     if (!autostart_enabled)
         return;
 
+    if( orig_drive_true_emulation_state == -1)
+    {
+        orig_drive_true_emulation_state = get_true_drive_emulation_state();
+    }
+ 
     if (maincpu_clk < min_cycles)
     {
         autostart_wait_for_reset = 0;
@@ -542,6 +547,7 @@
                 tape_seek_start(tape_image_dev1);
             }
         }
+        resources_set_int("VirtualDevices", 1); /* Kludge: iAN CooG - for t64 images we need devtraps ON */
         reboot_for_autostart(name, AUTOSTART_HASTAPE, runmode);
         lib_free(name);
 
@@ -654,6 +660,7 @@
     /* Setup FS-based drive emulation.  */
     fsdevice_set_directory(directory ? directory : ".", 8);
     set_true_drive_emulation_mode(0);
+    orig_drive_true_emulation_state =0;
     resources_set_int("VirtualDevices", 1);
     resources_set_int("FSDevice8ConvertP00", 1);
     file_system_detach_disk(8);

Modified: branches/marco/ports/vice/src/c64/reu.c
===================================================================
--- branches/marco/ports/vice/src/c64/reu.c	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/src/c64/reu.c	2008-06-29 22:07:51 UTC (rev 18935)
@@ -1,4 +1,4 @@
-/*! \file reu.c\n
+/*! \file reu.c \n
  *  \author Andreas Boose, Spiro Trikaliotis, Jouko Valta, Richard Hable, Ettore Perazzoli\n
  *  \brief   REU emulation.
  *
@@ -60,10 +60,11 @@
 #include "util.h"
 
 
-/**
+#if 0
 #define REU_DEBUG 1 /*!< define this if you want to get debugging output for the REU. */
+#endif
 
-/*! the debug levels to use when REU_DEBUG is defined */
+/*! \brief the debug levels to use when REU_DEBUG is defined */
 enum {
     DEBUG_LEVEL_NONE = 0,              /*!< do not output debugging information */
     DEBUG_LEVEL_REGISTER,              /*!< output debugging information concerning the REU registers */
@@ -73,7 +74,7 @@
 } debug_level_e;
 
 #ifdef REU_DEBUG
-    /*! dynamically define the debugging level */
+    /*! \brief dynamically define the debugging level */
     static enum debug_level_e DEBUG_LEVEL = 0;
 
     /*! \brief output debugging information
@@ -108,7 +109,7 @@
  * 01   Exec    0       Load    Delayed 0       0          Mode
  */
 
-/*! Offsets of the different REU registers */
+/*! \brief Offsets of the different REU registers */
 enum {
     REU_REG_R_STATUS         = 0x00, /*!< the REU status register */
     REU_REG_RW_COMMAND       = 0x01, /*!< the REU command register */
@@ -125,7 +126,7 @@
     REU_REG_LAST_REG         = 0x1F  /*!< the last register of the REU */
 };
 
-/*! bit definitions for the REU status register at offset REU_REG_R_STATUS */
+/*! \brief bit definitions for the REU status register at offset REU_REG_R_STATUS */
 enum {
     REU_REG_R_STATUS_CHIPVERSION_MASK  = 0x0F, /*!< bit mask the extract the chip version no. */
     REU_REG_R_STATUS_256K_CHIPS        = 0x10, /*!< set if 256K DRAMs (256Kx1) are used (1764, 1750), if unset, 64K DRAMs (64Kx1) are used (1700) */
@@ -134,7 +135,7 @@
     REU_REG_R_STATUS_INTERRUPT_PENDING = 0x80  /*!< set if an interrupt is pending. Cleared on read. */
 };
 
-/*! bit definitions for the REU command register at offset REU_REG_RW_COMMAND */
+/*! \brief bit definitions for the REU command register at offset REU_REG_RW_COMMAND */
 enum {
     REU_REG_RW_COMMAND_TRANSFER_TYPE_MASK    = 0x03,    /*!< bit mask to extract the transfer type */
     REU_REG_RW_COMMAND_TRANSFER_TYPE_TO_REU     = 0x00, /*!< transfer type is C64 -> REU */
@@ -147,12 +148,12 @@
     REU_REG_RW_COMMAND_EXECUTE               = 0x80     /*!< is set, the specified operation should start. */
 };
 
-/*! bit definitions for the REU bank register at offset REU_REG_RW_BANK */
+/*! \brief bit definitions for the REU bank register at offset REU_REG_RW_BANK */
 enum {
     REU_REG_RW_BANK_UNUSED = 0xF8  /*!< these bits are unused and always read as 1 */
 };
 
-/*! bit definitions for the REU interrupt register at offset REU_REG_RW_INTERRUPT */
+/*! \brief bit definitions for the REU interrupt register at offset REU_REG_RW_INTERRUPT */
 enum {
     REU_REG_RW_INTERRUPT_UNUSED_MASK          = 0x1F, /*!< these bits are unused and always read as 1 */
     REU_REG_RW_INTERRUPT_VERIFY_ENABLED       = 0x20, /*!< if set (and REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED is set, too), generate an interrupt if verify fails */
@@ -160,7 +161,7 @@
     REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED   = 0x80  /*!< is set, the REU can generate an interrupt. If unset, no interrupts can be generated */
 };
 
-/*! bit definitions for the REU address control register at offset REU_REG_RW_ADDR_CONTROL */
+/*! \brief bit definitions for the REU address control register at offset REU_REG_RW_ADDR_CONTROL */
 enum {
     REU_REG_RW_ADDR_CONTROL_UNUSED_MASK       = 0x3f, /*!< these bits are unused and always read as 1 */
     REU_REG_RW_ADDR_CONTROL_FIX_REC           = 0x40, /*!< if set, the REU address is fixed, it does not increment */
@@ -169,7 +170,7 @@
 
 /* REU registers */
 
-/*! define a complete set of REC registers */
+/*! \brief define a complete set of REC registers */
 struct rec_s {
     BYTE status;              /*!< status register at offset REU_REG_R_STATUS */
     BYTE command;             /*!< command register at offset REU_REG_RW_COMMAND */
@@ -189,10 +190,10 @@
     WORD transfer_length_shadow; /*!< shadow register of transfer_length */
 };
 
-/*! a complete REC description */
+/*! \brief a complete REC description */
 static struct rec_s rec;
 
-/*! some rec options which define the special behaviour */
+/*! \brief some rec options which define special behaviour */
 struct rec_options_s {
     unsigned int wrap_around;                   /*!< address where the REU has a wrap around */
     unsigned int special_wrap_around_1700;      /*!< address where the special 1700 wrap around occurs; if no 1700, the same avalue as wrap_around */
@@ -202,14 +203,14 @@
     BYTE         status_preset;                 /*!< preset value for the status (can be 0 or REU_REG_R_STATUS_256K_CHIPS) */
 };
 
-/*! a complete REC options description */
+/*! \brief a complete REC options description */
 static struct rec_options_s rec_options;
 
 
 
-/*! buffer which holds the REU image.  */
+/*! \brief pointer to a buffer which holds the REU image.  */
 static BYTE *reu_ram = NULL;
-/*! holds the old ram size of reu_ram. Used to determine if and how much of the 
+/*! \brief the old ram size of reu_ram. Used to determine if and how much of the 
     buffer has to cleared when resizing the REU. */
 static unsigned int old_reu_ram_size = 0;
 
@@ -222,20 +223,20 @@
 
 /* ------------------------------------------------------------------------- */
 
-/*! Flag: Do we enable the external REU?  */
+/*! \brief Flag: Is the external REU enabled?  */
 int reu_enabled;
 
-/*! Size of the REU.  */
+/*! \brief Size of the REU.  */
 static unsigned int reu_size = 0;
 
-/*! Size of the REU in KB.  */
+/*! \brief Size of the REU in KB.  */
 static int reu_size_kb = 0;
 
-/*! Filename of the REU image.  */
+/*! \brief Filename of the REU image.  */
 static char *reu_filename = NULL;
 
 
-/*! \internal set the reu to the enabled or disabled state
+/*! \internal \brief set the reu to the enabled or disabled state
 
  \param val
    if 0, disable the REU; else, enable it.
@@ -268,7 +269,7 @@
     }
 }
 
-/*! \internal set the size of the reu
+/*! \internal \brief set the size of the reu
 
  \param val
    the size of the REU, in KB
@@ -344,7 +345,7 @@
     return 0;
 }
 
-/*! \internal set the file name of the REU data
+/*! \internal \brief set the file name of the REU data
 
  \param name
    pointer to a buffer which holds the file name.
@@ -383,14 +384,14 @@
     return 0;
 }
 
-/*! string resources used by the REU module */
+/*! \brief string resources used by the REU module */
 static const resource_string_t resources_string[] = {
     { "REUfilename", "", RES_EVENT_NO, NULL,
       &reu_filename, set_reu_filename, NULL },
     { NULL }
 };
 
-/*! integer resources used by the REU module */
+/*! \brief integer resources used by the REU module */
 static const resource_int_t resources_int[] = {
     { "REU", 0, RES_EVENT_STRICT, (resource_value_t)0,
       &reu_enabled, set_reu_enabled, NULL },
@@ -399,7 +400,7 @@
     { NULL }
 };
 
-/*! initialize the reu resources
+/*! \brief initialize the reu resources
  \return
    0 on success, else -1.
 
@@ -414,7 +415,7 @@
     return resources_register_int(resources_int);
 }
 
-/*! uninitialize the reu resources */
+/*! \brief uninitialize the reu resources */
 void reu_resources_shutdown(void)
 {
     lib_free(reu_filename);
@@ -450,7 +451,7 @@
 };
 #endif
 
-/*! initialize the command-line options'
+/*! \brief initialize the command-line options'
  \return
    0 on success, else -1.
 
@@ -464,7 +465,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-/*! initialize the REU */
+/*! \brief initialize the REU */
 void reu_init(void)
 {
     reu_log = log_open("REU");
@@ -472,7 +473,7 @@
     reu_int_num = interrupt_cpu_status_int_new(maincpu_int_status, "REU");
 }
 
-/*! reset the REU */
+/*! \brief reset the REU */
 void reu_reset(void)
 {
     memset(&rec, 0, sizeof rec);
@@ -676,7 +677,7 @@
         break;
 
     case REU_REG_RW_BANK:
-        rec.bank_reu = byte;
+        rec.bank_reu = byte & ~ rec_options.reg_bank_unused;
         break;
 
     case REU_REG_RW_BLOCKLEN_LOW:
@@ -881,7 +882,8 @@
     The transfer length the operation stopped at
 
   \remark
-    if autoload is enabled, nothing is stored in the REU registers.
+    if autoload is enabled, the shadow registers are written back 
+    to the REU registers.
 */
 static void reu_dma_update_regs(WORD host_addr, unsigned int reu_addr,
                                 int len)
@@ -906,6 +908,10 @@
         rec.transfer_length = len;
     }
     else {
+        rec.base_computer   = rec.base_computer_shadow;
+        rec.base_reu        = rec.base_reu_shadow;
+        rec.transfer_length = rec.transfer_length_shadow;
+
         DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Autoload.") );
     }
 }

Modified: branches/marco/ports/vice/src/version.h
===================================================================
--- branches/marco/ports/vice/src/version.h	2008-06-29 22:05:18 UTC (rev 18934)
+++ branches/marco/ports/vice/src/version.h	2008-06-29 22:07:51 UTC (rev 18935)
@@ -28,11 +28,11 @@
 #define __VERSION_H__
 
 #ifndef VERSION
-#define VERSION "1.22.20"
+#define VERSION "1.22.21"
 #endif
 
 #ifndef VERSION_RC_NUMBER
-#define VERSION_RC_NUMBER 1,22,20,0
+#define VERSION_RC_NUMBER 1,22,21,0
 #endif
 
 #ifndef PACKAGE


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

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

From: <bla...@us...> - 2008-06-29 22:05:12

Revision: 18934
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18934&view=rev
Author:   blackystardust
Date:     2008-06-29 15:05:18 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
Added sol11/opensolaris/solaris express port to the solaris page and NEWS file.

Modified Paths:
--------------
    branches/marco/ports/vice/doc/html/plain/NEWS
    branches/marco/ports/vice/doc/html/solaris.html

Modified: branches/marco/ports/vice/doc/html/plain/NEWS
===================================================================
--- branches/marco/ports/vice/doc/html/plain/NEWS	2008-06-29 19:58:29 UTC (rev 18933)
+++ branches/marco/ports/vice/doc/html/plain/NEWS	2008-06-29 22:05:18 UTC (rev 18934)
@@ -21,6 +21,10 @@
 
 - New SkyOS port.
 
+- New Atari Mint port.
+
+- New Solaris Express aka OpenSolaris aka Solaris 11 port.
+
 ** C64/C128 changes
 -------------------
 

Modified: branches/marco/ports/vice/doc/html/solaris.html
===================================================================
--- branches/marco/ports/vice/doc/html/solaris.html	2008-06-29 19:58:29 UTC (rev 18933)
+++ branches/marco/ports/vice/doc/html/solaris.html	2008-06-29 22:05:18 UTC (rev 18934)
@@ -81,6 +81,12 @@
 </li>
 
 <li>
+Binary for <b>Intel Solaris Express/OpenSolaris/Solaris 11</b> systems:
+<a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-sol11-x86-local.gz">vice-2.0-sol11-x86-local.gz</a>.
+To be installed with the Solaris installer.
+</li>
+
+<li>
 Binary for <b>Sparc Solaris 2.6</b> systems:
 <a href="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.0-sol26-sparc-local.gz">vice-2.0-sol26-sparc-local.gz</a>.
 To be installed with the Solaris installer.


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

[Vice-emu-commit] SF.net SVN: vice-emu: [18933] tags/v1.22/v1.22.21/

From: <st...@us...> - 2008-06-29 19:58:20

Revision: 18933
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18933&view=rev
Author:   strik
Date:     2008-06-29 12:58:29 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
Tagged version 1.22.21.

Added Paths:
-----------
    tags/v1.22/v1.22.21/

Copied: tags/v1.22/v1.22.21 (from rev 18932, trunk)


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

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

From: <st...@us...> - 2008-06-29 19:58:08

Revision: 18932
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18932&view=rev
Author:   strik
Date:     2008-06-29 12:58:16 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
2008-06-29  Spiro Trikaliotis  <spi...@gm...>

	* Version 1.22.21

Modified Paths:
--------------
    trunk/vice/ChangeLog
    trunk/vice/configure.in
    trunk/vice/src/ChangeLog
    trunk/vice/src/version.h

Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog	2008-06-29 19:36:45 UTC (rev 18931)
+++ trunk/vice/ChangeLog	2008-06-29 19:58:16 UTC (rev 18932)
@@ -1,3 +1,7 @@
+2008-06-29  Spiro Trikaliotis  <spi...@gm...>
+
+	* Version 1.22.21
+
 2008-06-28  Spiro Trikaliotis  <spi...@gm...>
 
 	* data/CBM-II/win_shortcuts.vsc, data/VIC20/win_shortcuts.vsc,

Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in	2008-06-29 19:36:45 UTC (rev 18931)
+++ trunk/vice/configure.in	2008-06-29 19:58:16 UTC (rev 18932)
@@ -9,7 +9,7 @@
 
 VICE_VERSION_MAJOR=1
 VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=20
+VICE_VERSION_BUILD=21
 
 AC_SUBST(VICE_VERSION_MAJOR)
 AC_SUBST(VICE_VERSION_MINOR)

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-06-29 19:36:45 UTC (rev 18931)
+++ trunk/vice/src/ChangeLog	2008-06-29 19:58:16 UTC (rev 18932)
@@ -1,5 +1,9 @@
 2008-06-29  Spiro Trikaliotis  <spi...@gm...>
 
+	* Version 1.22.21
+
+2008-06-29  Spiro Trikaliotis  <spi...@gm...>
+
 	* arch/win32/ui.c: Add copy to clipboard for the text screen.
 	All emulators which support the monitor "screen" command are
 	supported, that is: x64, xplus4, xvic, x128 in VIC-II mode.

Modified: trunk/vice/src/version.h
===================================================================
--- trunk/vice/src/version.h	2008-06-29 19:36:45 UTC (rev 18931)
+++ trunk/vice/src/version.h	2008-06-29 19:58:16 UTC (rev 18932)
@@ -28,11 +28,11 @@
 #define __VERSION_H__
 
 #ifndef VERSION
-#define VERSION "1.22.20"
+#define VERSION "1.22.21"
 #endif
 
 #ifndef VERSION_RC_NUMBER
-#define VERSION_RC_NUMBER 1,22,20,0
+#define VERSION_RC_NUMBER 1,22,21,0
 #endif
 
 #ifndef PACKAGE


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

[Vice-emu-commit] SF.net SVN: vice-emu: [18931] trunk/vice/src/ChangeLog

From: <st...@us...> - 2008-06-29 19:36:39

Revision: 18931
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18931&view=rev
Author:   strik
Date:     2008-06-29 12:36:45 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
removed superfluous src/ directory names.

Modified Paths:
--------------
    trunk/vice/src/ChangeLog

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-06-29 19:34:50 UTC (rev 18930)
+++ trunk/vice/src/ChangeLog	2008-06-29 19:36:45 UTC (rev 18931)
@@ -9,12 +9,12 @@
 
 2008-06-28  Spiro Trikaliotis  <spi...@gm...>
 
-	* src/arch/win32/rescbm2.rc, src/arch/win32/resplus4.rc,
-	src/arch/win32/resmenu.txt, src/arch/win32/ui.c,
-	src/arch/win32/resvic20.rc, src/arch/win32/resc128.rc,
-	src/arch/win32/resc64.rc, src/arch/win32/respet.rc: Removed
-	IDM_EDIT_CUT (how should we cut something from the VICE window?
-	Does not make much sense, does it?
+	* arch/win32/rescbm2.rc, arch/win32/resplus4.rc,
+	arch/win32/resmenu.txt, arch/win32/ui.c, arch/win32/resvic20.rc,
+	arch/win32/resc128.rc, arch/win32/resc64.rc,
+	arch/win32/respet.rc: Removed IDM_EDIT_CUT (how should we cut
+	something from the VICE window? Does not make much sense, does
+	it?
 
 	* arch/win32/ui.c: Added paste function to paste from clipboard
 	to the VICE keyboard buffer. It is selected either via menu
@@ -478,10 +478,10 @@
 
 2008-05-18  Spiro Trikaliotis  <spi...@gm...>
 
-	* src/arch/win32/signals.c: break64() now has a full backup text
-	in case translate_text() fails. This prevents empty dialog boxes
-	in the case of an error, which occurs rather frequently on
-	Windows, as these calls fail.
+	* arch/win32/signals.c: break64() now has a full backup text in
+	case translate_text() fails. This prevents empty dialog boxes in
+	the case of an error, which occurs rather frequently on Windows,
+	as these calls fail.
 
 2008-05-18  Spiro Trikaliotis  <spi...@gm...>
 
@@ -593,8 +593,8 @@
 
 2008-04-19  Greg King  <gre...@ve...>
 
-	* src/c64/cart/ide64.c: adds a working RTC to the emulation of
-	the IDE64 cartridge.
+	* c64/cart/ide64.c: adds a working RTC to the emulation of the
+	IDE64 cartridge.
 
 2008-04-19  Spiro Trikaliotis  <spi...@gm...>
 
@@ -724,10 +724,10 @@
 	* arch/unix/x11/gnome/x11ui.c: Do not exit the program if HW
 	scaling not available at runtime.
 
-	* video/video-resources.c, src/video.h: Move resources vars
-	from video_resource_chip_t to video_render_config_t, which
-	were often unnecessarily duplicated, and made modification of
-	resources a nightmare.
+	* video/video-resources.c, video.h: Move resources vars from
+	video_resource_chip_t to video_render_config_t, which were often
+	unnecessarily duplicated, and made modification of resources a
+	nightmare.
 
 	* video/video-resources.c: Add resource HwScalePossible, to
 	enable/disable HW scaling menu entry.
@@ -2535,9 +2535,8 @@
 
 2007-01-21  Spiro Trikaliotis  <Spi...@gm...>
 
-	* ioutil.c, src/ioutil.h: Changed prototype of
-	ioutil_maxpathlen() to return an unsigned int in order to
-	remove warnings.
+	* ioutil.c, ioutil.h: Changed prototype of ioutil_maxpathlen()
+	to return an unsigned int in order to remove warnings.
 
 2007-01-21  Spiro Trikaliotis  <Spi...@gm...>
 


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

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

From: <st...@us...> - 2008-06-29 19:34:42

Revision: 18930
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18930&view=rev
Author:   strik
Date:     2008-06-29 12:34:50 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
2008-06-29  Spiro Trikaliotis  <spi...@gm...>

	* src/arch/win32/ui.c: Add copy to clipboard for the text
	screen.  All emulators which support the monitor "screen"
	command are supported, that is: x64, xplus4, xvic, x128 in
	VIC-II mode.  xcbm2 and xpet are not supported, as their base
	video addresses are not given with mem_get_screen_parameter().
	New functions read_screen_output(), ui_copy_clipboard().

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/win32/ui.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-06-28 14:51:02 UTC (rev 18929)
+++ trunk/vice/src/ChangeLog	2008-06-29 19:34:50 UTC (rev 18930)
@@ -1,3 +1,12 @@
+2008-06-29  Spiro Trikaliotis  <spi...@gm...>
+
+	* arch/win32/ui.c: Add copy to clipboard for the text screen.
+	All emulators which support the monitor "screen" command are
+	supported, that is: x64, xplus4, xvic, x128 in VIC-II mode.
+	xcbm2 and xpet are not supported, as their base video addresses
+	are not given with mem_get_screen_parameter(). New functions
+	read_screen_output(), ui_copy_clipboard().
+
 2008-06-28  Spiro Trikaliotis  <spi...@gm...>
 
 	* src/arch/win32/rescbm2.rc, src/arch/win32/resplus4.rc,

Modified: trunk/vice/src/arch/win32/ui.c
===================================================================
--- trunk/vice/src/arch/win32/ui.c	2008-06-28 14:51:02 UTC (rev 18929)
+++ trunk/vice/src/arch/win32/ui.c	2008-06-29 19:34:50 UTC (rev 18930)
@@ -28,6 +28,7 @@
 
 #include "vice.h"
 
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <windows.h>
@@ -982,6 +983,112 @@
 
 /* ------------------------------------------------------------------------ */
 
+static char * read_screen_output(void)
+{
+    char * outputbuffer = NULL;
+
+    do {
+        WORD base;
+        BYTE allrows, allcols;
+        unsigned int row, col;
+        unsigned int size;
+        char * p;
+
+        mem_get_screen_parameter(&base, &allrows, &allcols);
+
+        size = allrows * (allcols + 2) + 1;
+
+        outputbuffer = lib_malloc(size);
+        if (outputbuffer == NULL) {
+            break;
+        }
+
+        p = outputbuffer;
+
+        for (row = 0; row < allrows; row++) {
+            char * last_non_whitespace = p - 1;
+
+            for (col = 0; col < allcols; col++) {
+                BYTE data;
+
+                data = mem_bank_peek(0, base++, NULL);
+                data = charset_p_toascii(charset_screencode_to_petcii(data), 1);
+
+                if (data != ' ') {
+                    last_non_whitespace = p;
+                }
+                *p++ = data;
+            }
+
+            /* trim the line if there are only whitespace at the end */
+
+            if (last_non_whitespace < p) {
+                p = last_non_whitespace + 1;
+            }
+
+            /* add a CR/LF */
+
+            *p++ = '\r';
+            *p++ = '\n';
+        }
+
+        *p = 0;
+
+        assert(p < outputbuffer + size);
+
+    } while (0);
+
+    return outputbuffer;
+}
+
+static void ui_copy_clipboard(HWND window)
+{
+    BOOL clipboard_is_open = FALSE;
+    char * text;
+    HGLOBAL globaltext = NULL;
+
+    do {
+        char * p;
+
+        if ( ! OpenClipboard(window) ) {
+            break;
+        }
+        clipboard_is_open = TRUE;
+
+        if ( ! EmptyClipboard() ) {
+            break;
+        }
+
+        text = read_screen_output();
+        if (text == NULL) {
+            break;
+        }
+
+        globaltext = GlobalAlloc(GMEM_DDESHARE, strlen(text) + 1);
+        if (globaltext == NULL) {
+            break;
+        }
+
+        p = GlobalLock(globaltext);
+        strcpy(p, text);
+
+        SetClipboardData(CF_TEXT, globaltext);
+
+    } while (0);
+
+    if (globaltext) {
+        GlobalUnlock(globaltext);
+    }
+
+    if (text) {
+        lib_free(text);
+    }
+
+    if (clipboard_is_open) {
+        CloseClipboard();
+    }
+}
+
 static void ui_paste_clipboard_text(HWND window)
 {
     HANDLE hdata;
@@ -1104,10 +1211,6 @@
 
 static void handle_wm_initmenupopup(HMENU menu)
 {
-    /* not implemented yet: */
-
-    EnableMenuItem(menu, IDM_EDIT_COPY, MF_BYCOMMAND | MF_GRAYED);
-
     /* enable PASTE iff the clipboard contains "our" format: */
 
     EnableMenuItem(menu, IDM_EDIT_PASTE, 
@@ -1130,6 +1233,9 @@
       case IDM_EXIT:
         PostMessage(hwnd, WM_CLOSE, wparam, lparam);
         break;
+      case IDM_EDIT_COPY:
+        ui_copy_clipboard(hwnd);
+        break;
       case IDM_EDIT_PASTE:
         ui_paste_clipboard_text(hwnd);
         break;


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

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

From: <st...@us...> - 2008-06-28 14:50:57

Revision: 18929
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18929&view=rev
Author:   strik
Date:     2008-06-28 07:51:02 -0700 (Sat, 28 Jun 2008)

Log Message:
-----------
2008-06-28  Spiro Trikaliotis  <spi...@gm...>

	* src/arch/win32/rescbm2.rc, src/arch/win32/resplus4.rc,
	src/arch/win32/resmenu.txt, src/arch/win32/ui.c,
	src/arch/win32/resvic20.rc, src/arch/win32/resc128.rc,
	src/arch/win32/resc64.rc, src/arch/win32/respet.rc: Removed
	IDM_EDIT_CUT (how should we cut something from the VICE window?
	Does not make much sense, does it?

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/win32/resc128.rc
    trunk/vice/src/arch/win32/resc64.rc
    trunk/vice/src/arch/win32/rescbm2.rc
    trunk/vice/src/arch/win32/resmenu.txt
    trunk/vice/src/arch/win32/respet.rc
    trunk/vice/src/arch/win32/resplus4.rc
    trunk/vice/src/arch/win32/resvic20.rc
    trunk/vice/src/arch/win32/ui.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-06-28 14:44:09 UTC (rev 18928)
+++ trunk/vice/src/ChangeLog	2008-06-28 14:51:02 UTC (rev 18929)
@@ -1,5 +1,12 @@
 2008-06-28  Spiro Trikaliotis  <spi...@gm...>
 
+	* src/arch/win32/rescbm2.rc, src/arch/win32/resplus4.rc,
+	src/arch/win32/resmenu.txt, src/arch/win32/ui.c,
+	src/arch/win32/resvic20.rc, src/arch/win32/resc128.rc,
+	src/arch/win32/resc64.rc, src/arch/win32/respet.rc: Removed
+	IDM_EDIT_CUT (how should we cut something from the VICE window?
+	Does not make much sense, does it?
+
 	* arch/win32/ui.c: Added paste function to paste from clipboard
 	to the VICE keyboard buffer. It is selected either via menu
 	(Edit/Paste), or via right-click on the VICE window.

Modified: trunk/vice/src/arch/win32/resc128.rc
===================================================================
--- trunk/vice/src/arch/win32/resc128.rc	2008-06-28 14:44:09 UTC (rev 18928)
+++ trunk/vice/src/arch/win32/resc128.rc	2008-06-28 14:51:02 UTC (rev 18929)
@@ -129,7 +129,6 @@
     END
     POPUP "&Edit"
     BEGIN
-        MENUITEM "Cu&t", IDM_EDIT_CUT
         MENUITEM "&Copy", IDM_EDIT_COPY
         MENUITEM "&Paste", IDM_EDIT_PASTE
     END

Modified: trunk/vice/src/arch/win32/resc64.rc
===================================================================
--- trunk/vice/src/arch/win32/resc64.rc	2008-06-28 14:44:09 UTC (rev 18928)
+++ trunk/vice/src/arch/win32/resc64.rc	2008-06-28 14:51:02 UTC (rev 18929)
@@ -129,7 +129,6 @@
     END
     POPUP "&Edit"
     BEGIN
-        MENUITEM "Cu&t", IDM_EDIT_CUT
         MENUITEM "&Copy", IDM_EDIT_COPY
         MENUITEM "&Paste", IDM_EDIT_PASTE
     END

Modified: trunk/vice/src/arch/win32/rescbm2.rc
===================================================================
--- trunk/vice/src/arch/win32/rescbm2.rc	2008-06-28 14:44:09 UTC (rev 18928)
+++ trunk/vice/src/arch/win32/rescbm2.rc	2008-06-28 14:51:02 UTC (rev 18929)
@@ -98,7 +98,6 @@
     END
     POPUP "&Edit"
     BEGIN
-        MENUITEM "Cu&t", IDM_EDIT_CUT
         MENUITEM "&Copy", IDM_EDIT_COPY
         MENUITEM "&Paste", IDM_EDIT_PASTE
     END

Modified: trunk/vice/src/arch/win32/resmenu.txt
===================================================================
--- trunk/vice/src/arch/win32/resmenu.txt	2008-06-28 14:44:09 UTC (rev 18928)
+++ trunk/vice/src/arch/win32/resmenu.txt	2008-06-28 14:51:02 UTC (rev 18929)
@@ -59,7 +59,6 @@
 IDM_EXIT
 IDM_ABOUT
 IDM_PAUSE
-IDM_EDIT_CUT
 IDM_EDIT_COPY
 IDM_EDIT_PASTE
 IDM_SINGLE_FRAME_ADVANCE

Modified: trunk/vice/src/arch/win32/respet.rc
===================================================================
--- trunk/vice/src/arch/win32/respet.rc	2008-06-28 14:44:09 UTC (rev 18928)
+++ trunk/vice/src/arch/win32/respet.rc	2008-06-28 14:51:02 UTC (rev 18929)
@@ -96,7 +96,6 @@
     END
     POPUP "&Edit"
     BEGIN
-        MENUITEM "Cu&t", IDM_EDIT_CUT
         MENUITEM "&Copy", IDM_EDIT_COPY
         MENUITEM "&Paste", IDM_EDIT_PASTE
     END

Modified: trunk/vice/src/arch/win32/resplus4.rc
===================================================================
--- trunk/vice/src/arch/win32/resplus4.rc	2008-06-28 14:44:09 UTC (rev 18928)
+++ trunk/vice/src/arch/win32/resplus4.rc	2008-06-28 14:51:02 UTC (rev 18929)
@@ -108,7 +108,6 @@
     END
     POPUP "&Edit"
     BEGIN
-        MENUITEM "Cu&t", IDM_EDIT_CUT
         MENUITEM "&Copy", IDM_EDIT_COPY
         MENUITEM "&Paste", IDM_EDIT_PASTE
     END

Modified: trunk/vice/src/arch/win32/resvic20.rc
===================================================================
--- trunk/vice/src/arch/win32/resvic20.rc	2008-06-28 14:44:09 UTC (rev 18928)
+++ trunk/vice/src/arch/win32/resvic20.rc	2008-06-28 14:51:02 UTC (rev 18929)
@@ -106,7 +106,6 @@
     END
     POPUP "&Edit"
     BEGIN
-        MENUITEM "Cu&t", IDM_EDIT_CUT
         MENUITEM "&Copy", IDM_EDIT_COPY
         MENUITEM "&Paste", IDM_EDIT_PASTE
     END

Modified: trunk/vice/src/arch/win32/ui.c
===================================================================
--- trunk/vice/src/arch/win32/ui.c	2008-06-28 14:44:09 UTC (rev 18928)
+++ trunk/vice/src/arch/win32/ui.c	2008-06-28 14:51:02 UTC (rev 18929)
@@ -1106,7 +1106,6 @@
 {
     /* not implemented yet: */
 
-    EnableMenuItem(menu, IDM_EDIT_CUT, MF_BYCOMMAND | MF_GRAYED);
     EnableMenuItem(menu, IDM_EDIT_COPY, MF_BYCOMMAND | MF_GRAYED);
 
     /* enable PASTE iff the clipboard contains "our" format: */


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

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

From: <st...@us...> - 2008-06-28 14:44:03

Revision: 18928
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18928&view=rev
Author:   strik
Date:     2008-06-28 07:44:09 -0700 (Sat, 28 Jun 2008)

Log Message:
-----------
2008-06-28  Spiro Trikaliotis  <spi...@gm...>

	* data/CBM-II/win_shortcuts.vsc, data/VIC20/win_shortcuts.vsc,
	data/PLUS4/win_shortcuts.vsc, data/PET/win_shortcuts.vsc,
	data/C64/win_shortcuts.vsc, data/C128/win_shortcuts.vsc: Set
	default shortcuts Ctrl+C and Ctrl+V for Edit/Copy and Edit/Paste

Modified Paths:
--------------
    trunk/vice/ChangeLog
    trunk/vice/data/C128/win_shortcuts.vsc
    trunk/vice/data/C64/win_shortcuts.vsc
    trunk/vice/data/CBM-II/win_shortcuts.vsc
    trunk/vice/data/PET/win_shortcuts.vsc
    trunk/vice/data/PLUS4/win_shortcuts.vsc
    trunk/vice/data/VIC20/win_shortcuts.vsc

Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog	2008-06-28 02:58:40 UTC (rev 18927)
+++ trunk/vice/ChangeLog	2008-06-28 14:44:09 UTC (rev 18928)
@@ -1,5 +1,10 @@
 2008-06-28  Spiro Trikaliotis  <spi...@gm...>
 
+	* data/CBM-II/win_shortcuts.vsc, data/VIC20/win_shortcuts.vsc,
+	data/PLUS4/win_shortcuts.vsc, data/PET/win_shortcuts.vsc,
+	data/C64/win_shortcuts.vsc, data/C128/win_shortcuts.vsc: Set
+	default shortcuts Ctrl+C and Ctrl+V for Edit/Copy and Edit/Paste
+
 	* doc/html/plain/NEWS: Updated
 
 2008-06-23  Spiro Trikaliotis  <spi...@gm...>

Modified: trunk/vice/data/C128/win_shortcuts.vsc
===================================================================
--- trunk/vice/data/C128/win_shortcuts.vsc	2008-06-28 02:58:40 UTC (rev 18927)
+++ trunk/vice/data/C128/win_shortcuts.vsc	2008-06-28 14:44:09 UTC (rev 18928)
@@ -47,3 +47,7 @@
 ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
 ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
 ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
+
+CTRL        'C'         IDM_EDIT_COPY
+CTRL        'V'         IDM_EDIT_PASTE
+CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT

Modified: trunk/vice/data/C64/win_shortcuts.vsc
===================================================================
--- trunk/vice/data/C64/win_shortcuts.vsc	2008-06-28 02:58:40 UTC (rev 18927)
+++ trunk/vice/data/C64/win_shortcuts.vsc	2008-06-28 14:44:09 UTC (rev 18928)
@@ -47,3 +47,7 @@
 ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
 ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
 ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
+
+CTRL        'C'         IDM_EDIT_COPY
+CTRL        'V'         IDM_EDIT_PASTE
+CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT

Modified: trunk/vice/data/CBM-II/win_shortcuts.vsc
===================================================================
--- trunk/vice/data/CBM-II/win_shortcuts.vsc	2008-06-28 02:58:40 UTC (rev 18927)
+++ trunk/vice/data/CBM-II/win_shortcuts.vsc	2008-06-28 14:44:09 UTC (rev 18928)
@@ -47,3 +47,7 @@
 ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
 ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
 ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
+
+CTRL        'C'         IDM_EDIT_COPY
+CTRL        'V'         IDM_EDIT_PASTE
+CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT

Modified: trunk/vice/data/PET/win_shortcuts.vsc
===================================================================
--- trunk/vice/data/PET/win_shortcuts.vsc	2008-06-28 02:58:40 UTC (rev 18927)
+++ trunk/vice/data/PET/win_shortcuts.vsc	2008-06-28 14:44:09 UTC (rev 18928)
@@ -47,3 +47,7 @@
 ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
 ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
 ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
+
+CTRL        'C'         IDM_EDIT_COPY
+CTRL        'V'         IDM_EDIT_PASTE
+CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT

Modified: trunk/vice/data/PLUS4/win_shortcuts.vsc
===================================================================
--- trunk/vice/data/PLUS4/win_shortcuts.vsc	2008-06-28 02:58:40 UTC (rev 18927)
+++ trunk/vice/data/PLUS4/win_shortcuts.vsc	2008-06-28 14:44:09 UTC (rev 18928)
@@ -47,3 +47,7 @@
 ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
 ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
 ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
+
+CTRL        'C'         IDM_EDIT_COPY
+CTRL        'V'         IDM_EDIT_PASTE
+CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT

Modified: trunk/vice/data/VIC20/win_shortcuts.vsc
===================================================================
--- trunk/vice/data/VIC20/win_shortcuts.vsc	2008-06-28 02:58:40 UTC (rev 18927)
+++ trunk/vice/data/VIC20/win_shortcuts.vsc	2008-06-28 14:44:09 UTC (rev 18928)
@@ -47,3 +47,7 @@
 ALT         0x79        IDM_TOGGLE_MAINCPU_TRACE    F10     # VK_F10
 ALT         0x7A        IDM_TOGGLE_DRIVE0CPU_TRACE  F11     # VK_F11
 ALT         0x7B        IDM_TOGGLE_DRIVE1CPU_TRACE  F12     # VK_F12
+
+CTRL        'C'         IDM_EDIT_COPY
+CTRL        'V'         IDM_EDIT_PASTE
+CTRL        0x2D        IDM_EDIT_COPY                       # VK_INSERT


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

[Vice-emu-commit] SF.net SVN: vice-emu: [18927] branches/marco/ports/vice/doc/html/plain/NEWS

From: <bla...@us...> - 2008-06-28 02:58:32

Revision: 18927
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18927&view=rev
Author:   blackystardust
Date:     2008-06-27 19:58:40 -0700 (Fri, 27 Jun 2008)

Log Message:
-----------
Corrected a typo

Modified Paths:
--------------
    branches/marco/ports/vice/doc/html/plain/NEWS

Modified: branches/marco/ports/vice/doc/html/plain/NEWS
===================================================================
--- branches/marco/ports/vice/doc/html/plain/NEWS	2008-06-27 22:39:19 UTC (rev 18926)
+++ branches/marco/ports/vice/doc/html/plain/NEWS	2008-06-28 02:58:40 UTC (rev 18927)
@@ -26,7 +26,7 @@
 
 - Improved $01 behaviour with regards to unused bit fall-off.
 
-- Mew experimental NEOS and Amiga mouse support.
+- New experimental NEOS and Amiga mouse support.
 
 - Added a working RTC to the emulation of the IDE64 cartridge.
 


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

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

From: <st...@us...> - 2008-06-27 22:39:10

Revision: 18926
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18926&view=rev
Author:   strik
Date:     2008-06-27 15:39:19 -0700 (Fri, 27 Jun 2008)

Log Message:
-----------
2008-06-28  Spiro Trikaliotis  <spi...@gm...>

	* doc/html/plain/NEWS: Updated

Modified Paths:
--------------
    trunk/vice/ChangeLog
    trunk/vice/doc/html/plain/NEWS

Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog	2008-06-27 22:33:42 UTC (rev 18925)
+++ trunk/vice/ChangeLog	2008-06-27 22:39:19 UTC (rev 18926)
@@ -1,3 +1,7 @@
+2008-06-28  Spiro Trikaliotis  <spi...@gm...>
+
+	* doc/html/plain/NEWS: Updated
+
 2008-06-23  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.20

Modified: trunk/vice/doc/html/plain/NEWS
===================================================================
--- trunk/vice/doc/html/plain/NEWS	2008-06-27 22:33:42 UTC (rev 18925)
+++ trunk/vice/doc/html/plain/NEWS	2008-06-27 22:39:19 UTC (rev 18926)
@@ -35,6 +35,8 @@
 
 - Added support for the Action Replay 4 and StarDos cartridges.
 
+- Improved REU compatibility
+
 ** VIC20 changes
 ----------------
 
@@ -78,6 +80,9 @@
 - Fixed the reverse logic of the -confirmexit/+confirmexit and
   -singlecpu/+singlecpu command-line options.
 
+- allow for pasting into the VICE window: Either via menu
+  (Edit/Paste), or by right-clicking on the VICE window.
+
 ** BeOS changes
 ---------------
 
@@ -111,6 +116,7 @@
 - New memmap feature which allows tracking of memory accesses,
   activated by the configure option --enable-memmap.
 
+
 * Changes in VICE 1.22
 ======================
 


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

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

From: <st...@us...> - 2008-06-27 22:33:33

Revision: 18925
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18925&view=rev
Author:   strik
Date:     2008-06-27 15:33:42 -0700 (Fri, 27 Jun 2008)

Log Message:
-----------
2008-06-28  Spiro Trikaliotis  <spi...@gm...>

	* src/arch/win32/ui.c: Added paste function to paste from
	clipboard to the VICE keyboard buffer. It is selected either via
	menu (Edit/Paste), or via right-click on the VICE window.

	* src/arch/win32/resmenu.txt, src/arch/win32/rescbm2.rc,
	src/arch/win32/resplus4.rc, src/arch/win32/resmenu.txt,
	src/arch/win32/resvic20.rc, src/arch/win32/resc128.rc,
	src/arch/win32/resc64.rc, src/arch/win32/respet.rc: Added
	IDM_EDIT_CUT, IDM_EDIT_COPY and IDM_EDIT_PASTE.

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/win32/resc128.rc
    trunk/vice/src/arch/win32/resc64.rc
    trunk/vice/src/arch/win32/rescbm2.rc
    trunk/vice/src/arch/win32/resmenu.txt
    trunk/vice/src/arch/win32/respet.rc
    trunk/vice/src/arch/win32/resplus4.rc
    trunk/vice/src/arch/win32/resvic20.rc
    trunk/vice/src/arch/win32/ui.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-06-27 21:15:29 UTC (rev 18924)
+++ trunk/vice/src/ChangeLog	2008-06-27 22:33:42 UTC (rev 18925)
@@ -1,3 +1,15 @@
+2008-06-28  Spiro Trikaliotis  <spi...@gm...>
+
+	* arch/win32/ui.c: Added paste function to paste from clipboard
+	to the VICE keyboard buffer. It is selected either via menu
+	(Edit/Paste), or via right-click on the VICE window.
+
+	* arch/win32/resmenu.txt, arch/win32/rescbm2.rc,
+	arch/win32/resplus4.rc, arch/win32/resmenu.txt,
+	arch/win32/resvic20.rc, arch/win32/resc128.rc,
+	arch/win32/resc64.rc, arch/win32/respet.rc: Added IDM_EDIT_CUT,
+	IDM_EDIT_COPY and IDM_EDIT_PASTE.
+
 2008-06-27  Spiro Trikaliotis  <spi...@gm...>
 
 	* autostart.c: Incorporated patch from iAN Coog: 1. Add colon

Modified: trunk/vice/src/arch/win32/resc128.rc
===================================================================
--- trunk/vice/src/arch/win32/resc128.rc	2008-06-27 21:15:29 UTC (rev 18924)
+++ trunk/vice/src/arch/win32/resc128.rc	2008-06-27 22:33:42 UTC (rev 18925)
@@ -127,6 +127,12 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "Cu&t", IDM_EDIT_CUT
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Load snapshot &image...",          IDM_SNAPSHOT_LOAD

Modified: trunk/vice/src/arch/win32/resc64.rc
===================================================================
--- trunk/vice/src/arch/win32/resc64.rc	2008-06-27 21:15:29 UTC (rev 18924)
+++ trunk/vice/src/arch/win32/resc64.rc	2008-06-27 22:33:42 UTC (rev 18925)
@@ -127,6 +127,12 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "Cu&t", IDM_EDIT_CUT
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Load snapshot &image...",          IDM_SNAPSHOT_LOAD

Modified: trunk/vice/src/arch/win32/rescbm2.rc
===================================================================
--- trunk/vice/src/arch/win32/rescbm2.rc	2008-06-27 21:15:29 UTC (rev 18924)
+++ trunk/vice/src/arch/win32/rescbm2.rc	2008-06-27 22:33:42 UTC (rev 18925)
@@ -96,6 +96,12 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "Cu&t", IDM_EDIT_CUT
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Load snapshot &image...",          IDM_SNAPSHOT_LOAD

Modified: trunk/vice/src/arch/win32/resmenu.txt
===================================================================
--- trunk/vice/src/arch/win32/resmenu.txt	2008-06-27 21:15:29 UTC (rev 18924)
+++ trunk/vice/src/arch/win32/resmenu.txt	2008-06-27 22:33:42 UTC (rev 18925)
@@ -59,6 +59,9 @@
 IDM_EXIT
 IDM_ABOUT
 IDM_PAUSE
+IDM_EDIT_CUT
+IDM_EDIT_COPY
+IDM_EDIT_PASTE
 IDM_SINGLE_FRAME_ADVANCE
 IDM_AUTOSTART
 IDM_RESET_HARD

Modified: trunk/vice/src/arch/win32/respet.rc
===================================================================
--- trunk/vice/src/arch/win32/respet.rc	2008-06-27 21:15:29 UTC (rev 18924)
+++ trunk/vice/src/arch/win32/respet.rc	2008-06-27 22:33:42 UTC (rev 18925)
@@ -94,6 +94,12 @@
        MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "Cu&t", IDM_EDIT_CUT
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Load snapshot &image...", IDM_SNAPSHOT_LOAD

Modified: trunk/vice/src/arch/win32/resplus4.rc
===================================================================
--- trunk/vice/src/arch/win32/resplus4.rc	2008-06-27 21:15:29 UTC (rev 18924)
+++ trunk/vice/src/arch/win32/resplus4.rc	2008-06-27 22:33:42 UTC (rev 18925)
@@ -106,6 +106,12 @@
        MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "Cu&t", IDM_EDIT_CUT
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Load snapshot &image...", IDM_SNAPSHOT_LOAD

Modified: trunk/vice/src/arch/win32/resvic20.rc
===================================================================
--- trunk/vice/src/arch/win32/resvic20.rc	2008-06-27 21:15:29 UTC (rev 18924)
+++ trunk/vice/src/arch/win32/resvic20.rc	2008-06-27 22:33:42 UTC (rev 18925)
@@ -104,6 +104,12 @@
         MENUITEM SEPARATOR
         MENUITEM "E&xit", IDM_EXIT
     END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "Cu&t", IDM_EDIT_CUT
+        MENUITEM "&Copy", IDM_EDIT_COPY
+        MENUITEM "&Paste", IDM_EDIT_PASTE
+    END
     POPUP "Sna&pshot"
     BEGIN
         MENUITEM "Load snapshot &image...",  IDM_SNAPSHOT_LOAD

Modified: trunk/vice/src/arch/win32/ui.c
===================================================================
--- trunk/vice/src/arch/win32/ui.c	2008-06-27 21:15:29 UTC (rev 18924)
+++ trunk/vice/src/arch/win32/ui.c	2008-06-27 22:33:42 UTC (rev 18925)
@@ -40,6 +40,7 @@
 #include "attach.h"
 #include "autostart.h"
 #include "archdep.h"
+#include "charset.h"
 #include "debug.h"
 #include "drive.h"
 #include "drivecpu.h"
@@ -49,6 +50,7 @@
 #include "interrupt.h"
 #include "intl.h"
 #include "kbd.h"
+#include "kbdbuf.h"
 #include "lib.h"
 #include "log.h"
 #include "machine.h"
@@ -980,6 +982,76 @@
 
 /* ------------------------------------------------------------------------ */
 
+static void ui_paste_clipboard_text(HWND window)
+{
+    HANDLE hdata;
+    BOOL clipboard_is_open = FALSE;
+    char * text = NULL;
+    char * text_in_petscii = NULL;
+    
+    do {
+        DWORD size;
+
+        if ( ! OpenClipboard(window) ) {
+            break;
+        }
+
+        clipboard_is_open = TRUE;
+
+        hdata = GetClipboardData(CF_TEXT);
+
+        if ( ! hdata ) {
+            break;
+        }
+
+        text = GlobalLock(hdata);
+
+        if (text == NULL) {
+            break;
+        }
+
+        size = GlobalSize(hdata);
+
+        if (size < 1) {
+            break;
+        }
+
+        /*
+         * Allocate memmory for the string to convert in petscii.
+         * Note: As we are not sure if the original text is null-terminated,
+         *       do *not* use lib_stralloc()!
+         */
+        text_in_petscii = lib_malloc(size + 1);
+
+        if (text_in_petscii == NULL) {
+            break;
+        }
+
+        memcpy(text_in_petscii, text, size);
+        text_in_petscii[size] = 0;
+
+        charset_petconvstring(text_in_petscii, 0);
+
+        kbdbuf_feed(text_in_petscii);
+
+    } while (0);
+
+    if (text_in_petscii) {
+        lib_free(text_in_petscii);
+    }
+
+    if (text) {
+        GlobalUnlock(text);
+    }
+
+    if (clipboard_is_open) {
+        CloseClipboard();
+    }
+}
+
+
+/* ------------------------------------------------------------------------ */
+
 /* FIXME: tmp hack.  */
 int syscolorchanged, displaychanged, querynewpalette, palettechanged;
 
@@ -1030,6 +1102,20 @@
     }
 }
 
+static void handle_wm_initmenupopup(HMENU menu)
+{
+    /* not implemented yet: */
+
+    EnableMenuItem(menu, IDM_EDIT_CUT, MF_BYCOMMAND | MF_GRAYED);
+    EnableMenuItem(menu, IDM_EDIT_COPY, MF_BYCOMMAND | MF_GRAYED);
+
+    /* enable PASTE iff the clipboard contains "our" format: */
+
+    EnableMenuItem(menu, IDM_EDIT_PASTE, 
+        MF_BYCOMMAND 
+        | ( IsClipboardFormatAvailable(CF_TEXT) ? MF_ENABLED : MF_GRAYED));
+}
+
 static void handle_wm_command(WPARAM wparam, LPARAM lparam, HWND hwnd)
 {
     /* Handle machine specific commands first.  */
@@ -1045,6 +1131,9 @@
       case IDM_EXIT:
         PostMessage(hwnd, WM_CLOSE, wparam, lparam);
         break;
+      case IDM_EDIT_PASTE:
+        ui_paste_clipboard_text(hwnd);
+        break;
       case IDM_ABOUT:
       case IDM_HELP:
       case IDM_CONTRIBUTORS:
@@ -1393,6 +1482,9 @@
           This message seems to be a good candidate for the remote desktop. */
         ui_redraw_all_windows();
         return 0;
+      case WM_INITMENUPOPUP:
+        handle_wm_initmenupopup((HMENU)wparam);
+        break;
       case WM_COMMAND:
         handle_wm_command(wparam, lparam, window);
         return 0;
@@ -1482,6 +1574,9 @@
       case WM_NCLBUTTONDOWN:
         vsync_suspend_speed_eval();
         break;
+      case WM_RBUTTONDOWN:
+        ui_paste_clipboard_text(window);
+        break;
       case WM_NOTIFY:
         statusbar_notify(window, window_index, wparam, lparam);
         break;


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

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

From: <st...@us...> - 2008-06-27 21:15:28

Revision: 18924
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18924&view=rev
Author:   strik
Date:     2008-06-27 14:15:29 -0700 (Fri, 27 Jun 2008)

Log Message:
-----------
src/autostart: Added colon (":") after LOAD and RUN also if autostarting
a diskette.

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/autostart.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-06-27 20:46:49 UTC (rev 18923)
+++ trunk/vice/src/ChangeLog	2008-06-27 21:15:29 UTC (rev 18924)
@@ -1,7 +1,7 @@
 2008-06-27  Spiro Trikaliotis  <spi...@gm...>
 
 	* autostart.c: Incorporated patch from iAN Coog: 1. Add colon
-	(":") after "LOAD" and "RUN" lines using tostart. This is
+	(":") after "LOAD" and "RUN" lines used to start. This is
 	helpful if there is already something on the screen, to prevent
 	it to provoke some error messages. 2. remember original true
 	drive emulation state before using autostart. This fixes the

Modified: trunk/vice/src/autostart.c
===================================================================
--- trunk/vice/src/autostart.c	2008-06-27 20:46:49 UTC (rev 18923)
+++ trunk/vice/src/autostart.c	2008-06-27 21:15:29 UTC (rev 18924)
@@ -374,9 +374,9 @@
             traps = 1;
         }
         if (autostart_program_name)
-            tmp = lib_msprintf("LOAD\"%s\",8,1\r", autostart_program_name);
+            tmp = lib_msprintf("LOAD\"%s\",8,1:\r", autostart_program_name);
         else
-            tmp = lib_stralloc("LOAD\"*\",8,1\r");
+            tmp = lib_stralloc("LOAD\"*\",8,1:\r");
         kbdbuf_feed(tmp);
         lib_free(tmp);
 


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

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

From: <st...@us...> - 2008-06-27 20:46:40

Revision: 18923
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18923&view=rev
Author:   strik
Date:     2008-06-27 13:46:49 -0700 (Fri, 27 Jun 2008)

Log Message:
-----------
2008-06-27  Spiro Trikaliotis  <spi...@gm...>

	* src/autostart.c: Incorporated patch from iAN Coog: 1. Add
	colon (":") after "LOAD" and "RUN" lines using tostart. This is
	helpful if there is already something on the screen, to prevent
	it to provoke some error messages. 2. remember original true
	drive emulation state before using autostart. This fixes the
	problem that TDE is not re-activated after autostart.  3. Dev
	Traps set to ON always in autostart_tape() for T64s. T64 without
	VTD don't load, so it's a must to activate it always with them.
	(TAP files don't care.)

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/autostart.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-06-27 16:33:18 UTC (rev 18922)
+++ trunk/vice/src/ChangeLog	2008-06-27 20:46:49 UTC (rev 18923)
@@ -1,3 +1,15 @@
+2008-06-27  Spiro Trikaliotis  <spi...@gm...>
+
+	* autostart.c: Incorporated patch from iAN Coog: 1. Add colon
+	(":") after "LOAD" and "RUN" lines using tostart. This is
+	helpful if there is already something on the screen, to prevent
+	it to provoke some error messages. 2. remember original true
+	drive emulation state before using autostart. This fixes the
+	problem that TDE is not re-activated after autostart.  3. Dev
+	Traps set to ON always in autostart_tape() for T64s. T64 without
+	VTD don't load, so it's a must to activate it always with them.
+	(TAP files don't care.)
+
 2008-06-25  Spiro Trikaliotis  <spi...@gm...>
 
 	* arch/win32/vice.dsw, arch/win32/_all.dsp: New (dummy) project

Modified: trunk/vice/src/autostart.c
===================================================================
--- trunk/vice/src/autostart.c	2008-06-27 16:33:18 UTC (rev 18922)
+++ trunk/vice/src/autostart.c	2008-06-27 20:46:49 UTC (rev 18923)
@@ -91,7 +91,7 @@
 
 /* Flag: was true drive emulation turned on when we started booting the disk
    image?  */
-static int orig_drive_true_emulation_state = 0;
+static int orig_drive_true_emulation_state = -1;
 
 /* PETSCII name of the program to load. NULL if default */
 static BYTE *autostart_program_name = NULL;
@@ -292,11 +292,11 @@
       case YES:
         log_message(autostart_log, "Loading file.");
         if (autostart_program_name) {
-            tmp = util_concat("LOAD\"", autostart_program_name, "\"\r", NULL);
+            tmp = util_concat("LOAD\"", autostart_program_name, "\":\r", NULL);
             kbdbuf_feed(tmp);
             lib_free(tmp);
         } else {
-            kbdbuf_feed("LOAD\r");
+            kbdbuf_feed("LOAD:\r");
         }
         if (tape_tap_attched()) {
             autostartmode = AUTOSTART_PRESSPLAYONTAPE;
@@ -333,7 +333,7 @@
     switch (check("READY.", AUTOSTART_WAIT_BLINK)) {
       case YES:
         log_message(autostart_log, "Starting program.");
-        kbdbuf_feed("RUN\r");
+        kbdbuf_feed("RUN:\r");
         autostartmode = AUTOSTART_DONE;
         break;
       case NO:
@@ -382,7 +382,7 @@
 
         if (!traps) {
             if (autostart_run_mode == AUTOSTART_MODE_RUN)
-                kbdbuf_feed("RUN\r");
+                kbdbuf_feed("RUN:\r");
             autostartmode = AUTOSTART_DONE;
         } else {
             autostartmode = AUTOSTART_LOADINGDISK;
@@ -422,6 +422,11 @@
     if (!autostart_enabled)
         return;
 
+    if( orig_drive_true_emulation_state == -1)
+    {
+        orig_drive_true_emulation_state = get_true_drive_emulation_state();
+    }
+ 
     if (maincpu_clk < min_cycles)
     {
         autostart_wait_for_reset = 0;
@@ -542,6 +547,7 @@
                 tape_seek_start(tape_image_dev1);
             }
         }
+        resources_set_int("VirtualDevices", 1); /* Kludge: iAN CooG - for t64 images we need devtraps ON */
         reboot_for_autostart(name, AUTOSTART_HASTAPE, runmode);
         lib_free(name);
 
@@ -654,6 +660,7 @@
     /* Setup FS-based drive emulation.  */
     fsdevice_set_directory(directory ? directory : ".", 8);
     set_true_drive_emulation_mode(0);
+    orig_drive_true_emulation_state =0;
     resources_set_int("VirtualDevices", 1);
     resources_set_int("FSDevice8ConvertP00", 1);
     file_system_detach_disk(8);


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

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

From: <bla...@us...> - 2008-06-27 16:33:14

Revision: 18922
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18922&view=rev
Author:   blackystardust
Date:     2008-06-27 09:33:18 -0700 (Fri, 27 Jun 2008)

Log Message:
-----------
Added a fix to a possible crash of the win32 port when loading settings that turned on the poor performance new PAL emu combo, and added support for opensolaris to the make-bindist.sh script.

Modified Paths:
--------------
    branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh
    branches/marco/ports/vice/src/video/video-resources.c

Modified: branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh
===================================================================
--- branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh	2008-06-27 00:12:07 UTC (rev 18921)
+++ branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh	2008-06-27 16:33:18 UTC (rev 18922)
@@ -157,6 +157,10 @@
     if test x"$arch_version" = "x5.10"; then
       arch_version=sol10
     fi
+
+    if test x"$arch_version" = "x5.11"; then
+      arch_version=sol11
+    fi
   else
     arch_cpu=x86
 

Modified: branches/marco/ports/vice/src/video/video-resources.c
===================================================================
--- branches/marco/ports/vice/src/video/video-resources.c	2008-06-27 00:12:07 UTC (rev 18921)
+++ branches/marco/ports/vice/src/video/video-resources.c	2008-06-27 16:33:18 UTC (rev 18922)
@@ -626,6 +626,12 @@
     if (pal_enabled)
         resources_get_int("PALMode", &pal_mode);
 
+    if (video_current_canvas==NULL)
+      return;
+
+    if (video_current_canvas->videoconfig==NULL)
+      return;
+
     if (pal_enabled != 0 && pal_mode == 2 &&
         video_current_canvas->videoconfig->fullscreen_enabled == 0 &&
         video_current_canvas->videoconfig->doublescan != 0 &&


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.

Flat | Threaded

<< < 1 .. 1060 1061 1062 1063 1064 .. 1071 > >> (Page 1062 of 1071)