vice-emu-commit Mailing List for VICE (Page 1062)
Versatile Commodore Emulator
Brought to you by:
blackystardust,
gpz
Menu
▾
▴
vice-emu-commit — Commit notifications for the source server
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(38) |
May
(60) |
Jun
(122) |
Jul
(148) |
Aug
(178) |
Sep
(151) |
Oct
(131) |
Nov
(208) |
Dec
(129) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(193) |
Feb
(209) |
Mar
(221) |
Apr
(243) |
May
(165) |
Jun
(168) |
Jul
(198) |
Aug
(161) |
Sep
(103) |
Oct
(98) |
Nov
(168) |
Dec
(99) |
| 2010 |
Jan
(263) |
Feb
(156) |
Mar
(57) |
Apr
(93) |
May
(85) |
Jun
(124) |
Jul
(57) |
Aug
(58) |
Sep
(113) |
Oct
(148) |
Nov
(114) |
Dec
(193) |
| 2011 |
Jan
(200) |
Feb
(207) |
Mar
(91) |
Apr
(91) |
May
(142) |
Jun
(104) |
Jul
(115) |
Aug
(137) |
Sep
(266) |
Oct
(91) |
Nov
(85) |
Dec
(186) |
| 2012 |
Jan
(98) |
Feb
(146) |
Mar
(160) |
Apr
(99) |
May
(59) |
Jun
(257) |
Jul
(84) |
Aug
(103) |
Sep
(169) |
Oct
(206) |
Nov
(90) |
Dec
(296) |
| 2013 |
Jan
(294) |
Feb
(130) |
Mar
(36) |
Apr
(14) |
May
(51) |
Jun
(74) |
Jul
(180) |
Aug
(85) |
Sep
(26) |
Oct
(45) |
Nov
(29) |
Dec
(21) |
| 2014 |
Jan
(56) |
Feb
(40) |
Mar
(57) |
Apr
(30) |
May
(31) |
Jun
(11) |
Jul
(107) |
Aug
(135) |
Sep
(142) |
Oct
(195) |
Nov
(139) |
Dec
(133) |
| 2015 |
Jan
(293) |
Feb
(161) |
Mar
(146) |
Apr
(85) |
May
(139) |
Jun
(51) |
Jul
(21) |
Aug
(24) |
Sep
(29) |
Oct
(136) |
Nov
(212) |
Dec
(118) |
| 2016 |
Jan
(119) |
Feb
(165) |
Mar
(229) |
Apr
(219) |
May
(134) |
Jun
(119) |
Jul
(134) |
Aug
(236) |
Sep
(203) |
Oct
(215) |
Nov
(300) |
Dec
(140) |
| 2017 |
Jan
(188) |
Feb
(20) |
Mar
(147) |
Apr
(198) |
May
(26) |
Jun
(21) |
Jul
(67) |
Aug
(219) |
Sep
(209) |
Oct
(194) |
Nov
(144) |
Dec
(99) |
| 2018 |
Jan
(139) |
Feb
(122) |
Mar
(116) |
Apr
(85) |
May
(232) |
Jun
(181) |
Jul
(190) |
Aug
(105) |
Sep
(92) |
Oct
(178) |
Nov
(105) |
Dec
(86) |
| 2019 |
Jan
(119) |
Feb
(79) |
Mar
(74) |
Apr
(117) |
May
(115) |
Jun
(307) |
Jul
(107) |
Aug
(131) |
Sep
(103) |
Oct
(60) |
Nov
(118) |
Dec
(70) |
| 2020 |
Jan
(114) |
Feb
(103) |
Mar
(77) |
Apr
(121) |
May
(193) |
Jun
(110) |
Jul
(214) |
Aug
(210) |
Sep
(179) |
Oct
(260) |
Nov
(237) |
Dec
(334) |
| 2021 |
Jan
(163) |
Feb
(186) |
Mar
(58) |
Apr
(81) |
May
(108) |
Jun
(175) |
Jul
(154) |
Aug
(180) |
Sep
(217) |
Oct
(204) |
Nov
(232) |
Dec
(190) |
| 2022 |
Jan
(253) |
Feb
(134) |
Mar
(229) |
Apr
(190) |
May
(125) |
Jun
(70) |
Jul
(8) |
Aug
(22) |
Sep
(19) |
Oct
(33) |
Nov
(94) |
Dec
(164) |
| 2023 |
Jan
(158) |
Feb
(366) |
Mar
(272) |
Apr
(109) |
May
(198) |
Jun
(226) |
Jul
(200) |
Aug
(94) |
Sep
(108) |
Oct
(62) |
Nov
(175) |
Dec
(116) |
| 2024 |
Jan
(35) |
Feb
(40) |
Mar
(51) |
Apr
(89) |
May
(24) |
Jun
(26) |
Jul
(53) |
Aug
(71) |
Sep
(23) |
Oct
(11) |
Nov
(22) |
Dec
(58) |
| 2025 |
Jan
(26) |
Feb
(40) |
Mar
(107) |
Apr
(39) |
May
(35) |
Jun
(20) |
Jul
(11) |
Aug
(24) |
Sep
(35) |
Oct
(28) |
Nov
(14) |
Dec
|
|
From: <st...@us...> - 2008-07-07 18:19:14
|
Revision: 18968
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18968&view=rev
Author: strik
Date: 2008-07-07 11:19:16 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
2008-07-07 Spiro Trikaliotis <spi...@gm...>
* c64/reu.c: fixed "end-of-block" for REU compare operation
according to Wolfgang Moser's REU reference.
Modified Paths:
--------------
trunk/vice/src/ChangeLog
trunk/vice/src/c64/reu.c
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-07-07 18:15:00 UTC (rev 18967)
+++ trunk/vice/src/ChangeLog 2008-07-07 18:19:16 UTC (rev 18968)
@@ -1,5 +1,8 @@
2008-07-07 Spiro Trikaliotis <spi...@gm...>
+ * c64/reu.c: fixed "end-of-block" for REU compare operation
+ according to Wolfgang Moser's REU reference.
+
* init.c, autostart.c, autostart.h, translate.txt, translate.c:
Added new command-line options -autostartrunwithcolon and
+autostartrunwithcolon along with corresponding vicerc option
Modified: trunk/vice/src/c64/reu.c
===================================================================
--- trunk/vice/src/c64/reu.c 2008-07-07 18:15:00 UTC (rev 18967)
+++ trunk/vice/src/c64/reu.c 2008-07-07 18:19:16 UTC (rev 18968)
@@ -202,6 +202,7 @@
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 */
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) */
+ unsigned int first_unused_register_address; /*!< the highest address the used REU register occupy */
};
/*! \brief a complete REC options description */
@@ -270,6 +271,33 @@
}
}
+/*! \internal \brief set the first unused REU register address
+
+ \param val
+ the end of the used REU register area; should be equal
+ to or bigger than REU_REG_RW_UNUSED.
+
+ \param param
+ unused
+
+ \return
+ 0 on success, else -1.
+*/
+static int set_reu_first_unused(int val, void *param)
+{
+ int retval = -1;
+
+ if (val >= REU_REG_RW_UNUSED) {
+ rec_options.first_unused_register_address = val;
+ retval = 0;
+ }
+ else {
+ log_message(reu_log, "Invalid first unused REU address %02x.", val);
+ };
+
+ return retval;
+}
+
/*! \internal \brief set the size of the reu
\param val
@@ -317,6 +345,7 @@
rec_options.wrap_around_mask_when_storing = rec_options.wrap_around - 1;
rec_options.reg_bank_unused = REU_REG_RW_BANK_UNUSED;
rec_options.status_preset = REU_REG_R_STATUS_256K_CHIPS;
+ rec_options.first_unused_register_address = REU_REG_RW_UNUSED;
switch (val) {
case 128:
@@ -398,6 +427,8 @@
&reu_enabled, set_reu_enabled, NULL },
{ "REUsize", 512, RES_EVENT_NO, NULL,
&reu_size_kb, set_reu_size, NULL },
+ { "REUfirstUnusedRegister", REU_REG_RW_UNUSED, RES_EVENT_NO, NULL,
+ &rec_options.first_unused_register_address, set_reu_first_unused, NULL },
{ NULL }
};
@@ -577,7 +608,7 @@
{
BYTE retval = 0xff;
- assert(addr <= REU_REG_LAST_REG);
+ addr &= REU_REG_LAST_REG;
switch (addr) {
case REU_REG_R_STATUS:
@@ -646,7 +677,7 @@
*/
static void reu_store_without_sideeffects(WORD addr, BYTE byte)
{
- assert(addr <= REU_REG_LAST_REG);
+ addr &= REU_REG_LAST_REG;
switch (addr)
{
@@ -722,31 +753,32 @@
{
BYTE retval;
- addr &= REU_REG_LAST_REG;
+ addr &= 0xff;
- if (addr < REU_REG_RW_UNUSED) {
+ if (addr < rec_options.first_unused_register_address) {
io_source = IO_SOURCE_REU;
- }
- retval = reu_read_without_sideeffects(addr);
+ retval = reu_read_without_sideeffects(addr);
- switch (addr) {
- case REU_REG_R_STATUS:
- /* Bits 7-5 are cleared when register is read, and pending IRQs are
- removed. */
- rec.status &=
- ~(REU_REG_R_STATUS_VERIFY_ERROR
- | REU_REG_R_STATUS_END_OF_BLOCK
- | REU_REG_R_STATUS_INTERRUPT_PENDING
- );
+ switch (addr) {
+ case REU_REG_R_STATUS:
+ /* Bits 7-5 are cleared when register is read, and pending IRQs are
+ removed. */
+ rec.status &=
+ ~(REU_REG_R_STATUS_VERIFY_ERROR
+ | REU_REG_R_STATUS_END_OF_BLOCK
+ | REU_REG_R_STATUS_INTERRUPT_PENDING
+ );
- maincpu_set_irq(reu_int_num, 0);
- break;
- default:
- break;
+ maincpu_set_irq(reu_int_num, 0);
+ break;
+ default:
+ break;
+ }
+
+ DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "read [$%02X] => $%02X.", addr, retval) );
}
- DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "read [$%02X] => $%02X.", addr, retval) );
return retval;
}
@@ -762,16 +794,18 @@
*/
void REGPARM2 reu_store(WORD addr, BYTE byte)
{
- addr &= REU_REG_LAST_REG;
+ addr &= 0xff;
- reu_store_without_sideeffects(addr, byte);
+ if (addr < rec_options.first_unused_register_address) {
+ reu_store_without_sideeffects(addr, byte);
- DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "store [$%02X] <= $%02X.", addr, (int)byte) );
+ DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "store [$%02X] <= $%02X.", addr, (int)byte) );
- /* write REC command register
- * DMA only if execution bit (7) set - RH */
- if ((addr == REU_REG_RW_COMMAND) && (rec.command & REU_REG_RW_COMMAND_EXECUTE)) {
- reu_dma(rec.command & REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED);
+ /* write REC command register
+ * DMA only if execution bit (7) set - RH */
+ if ((addr == REU_REG_RW_COMMAND) && (rec.command & REU_REG_RW_COMMAND_EXECUTE)) {
+ reu_dma(rec.command & REU_REG_RW_COMMAND_FF00_TRIGGER_DISABLED);
+ }
}
}
@@ -920,6 +954,24 @@
}
}
+/*! \brief Mark END-OF-BLOCK condition
+
+ \return
+ The value to store to the length register (hard-coded to 1)
+
+ \remark
+ Whenever a REU operation completes, the END-OF-BLOCK bit
+ is set. This is done with the help of this function,
+ as this occurs at different places.
+*/
+static int reu_set_end_of_block(void)
+{
+ rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
+ DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
+
+ return 0x01; /* the length value to store after the transfer */
+}
+
/*! \brief DMA operation writing from the host to the REU
\param host_addr
@@ -959,9 +1011,7 @@
store_to_reu(reu_addr, value);
host_addr = (host_addr + host_step) & 0xffff;
}
- len = 0x1;
- rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
- DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
+ len = reu_set_end_of_block();
reu_dma_update_regs(host_addr, reu_addr, len);
}
@@ -1001,9 +1051,7 @@
machine_handle_pending_alarms(0);
host_addr = (host_addr + host_step) & 0xffff;
}
- len = 1;
- rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
- DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
+ len = reu_set_end_of_block();
reu_dma_update_regs(host_addr, reu_addr, len);
}
@@ -1048,9 +1096,7 @@
machine_handle_pending_alarms(0);
host_addr = (host_addr + host_step) & 0xffff;
}
- len = 1;
- rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
- DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
+ len = reu_set_end_of_block();
reu_dma_update_regs(host_addr, reu_addr, len);
}
@@ -1099,6 +1145,13 @@
DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "VERIFY ERROR") );
rec.status |= REU_REG_R_STATUS_VERIFY_ERROR;
+ /* weird behaviour of the 17xx: If the last or next-to-last byte
+ * failed, the "end of block transfer" bit is set, too.
+ */
+ if ( (len == 0) || (len == 1) ) {
+ len = reu_set_end_of_block();
+ }
+
if (rec.int_mask_reg & (REU_REG_RW_INTERRUPT_VERIFY_ENABLED | REU_REG_RW_INTERRUPT_INTERRUPTS_ENABLED)) {
DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "Verify Interrupt pending") );
rec.status |= REU_REG_R_STATUS_INTERRUPT_PENDING;
@@ -1110,9 +1163,7 @@
if (len < 0) {
/* all bytes are equal, mark End Of Block */
- rec.status |= REU_REG_R_STATUS_END_OF_BLOCK;
- len = 1;
- DEBUG_LOG( DEBUG_LEVEL_REGISTER, (reu_log, "END OF BLOCK") );
+ len = reu_set_end_of_block();
}
reu_dma_update_regs(host_addr, reu_addr, len);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-07 18:15:03
|
Revision: 18967
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18967&view=rev
Author: strik
Date: 2008-07-07 11:15:00 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
2008-07-07 Spiro Trikaliotis <spi...@gm...>
* src/init.c, src/autostart.c, src/autostart.h,
src/translate.txt, src/translate.c: Added new command-line
options -autostartrunwithcolon and +autostartrunwithcolon along
with corresponding vicerc option AutostartRunWithColon=x.
Modified Paths:
--------------
trunk/vice/src/ChangeLog
trunk/vice/src/autostart.c
trunk/vice/src/autostart.h
trunk/vice/src/init.c
trunk/vice/src/translate.c
trunk/vice/src/translate.txt
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-07-07 17:55:09 UTC (rev 18966)
+++ trunk/vice/src/ChangeLog 2008-07-07 18:15:00 UTC (rev 18967)
@@ -1,3 +1,10 @@
+2008-07-07 Spiro Trikaliotis <spi...@gm...>
+
+ * init.c, autostart.c, autostart.h, translate.txt, translate.c:
+ Added new command-line options -autostartrunwithcolon and
+ +autostartrunwithcolon along with corresponding vicerc option
+ AutostartRunWithColon=x.
+
2008-07-07 Marco van den Heuvel <bla...@ya...>
* arch/beos/Makefile.am, arch/beos/constants.h, arch/beos/ui.cc,
Modified: trunk/vice/src/autostart.c
===================================================================
--- trunk/vice/src/autostart.c 2008-07-07 17:55:09 UTC (rev 18966)
+++ trunk/vice/src/autostart.c 2008-07-07 18:15:00 UTC (rev 18967)
@@ -37,6 +37,7 @@
#include "archdep.h"
#include "autostart.h"
#include "attach.h"
+#include "cmdline.h"
#include "datasette.h"
#include "drive.h"
#include "fileio.h"
@@ -112,6 +113,89 @@
static int autostart_wait_for_reset;
/* ------------------------------------------------------------------------- */
+static int AutostartRunWithColon = 0;
+
+static const char * const AutostartRunCommandsAvailable[] = { "RUN\r", "RUN:\r" };
+
+static const char * AutostartRunCommand = NULL;
+
+/*! \internal \brief set the reu to the enabled or disabled state
+
+ \param val
+ if 0, disable the REU; else, enable it.
+
+ \param param
+ unused
+
+ \return
+ 0 on success. else -1.
+*/
+static int set_autostart_run_with_colon(int val, void *param)
+{
+ AutostartRunWithColon = val ? 1 : 0;
+
+ AutostartRunCommand = AutostartRunCommandsAvailable[AutostartRunWithColon];
+
+ return 0;
+}
+
+
+/*! \brief integer resources used by the REU module */
+static const resource_int_t resources_int[] = {
+ { "AutostartRunWithColon", 0, RES_EVENT_NO, (resource_value_t)0,
+ &AutostartRunWithColon, set_autostart_run_with_colon, NULL },
+ { NULL }
+};
+
+/*! \brief initialize the resources
+ \return
+ 0 on success, else -1.
+
+ \remark
+ Registers the integer resources
+*/
+int autostart_resources_init(void)
+{
+ return resources_register_int(resources_int);
+}
+
+/* ------------------------------------------------------------------------- */
+
+#ifdef HAS_TRANSLATION
+static const cmdline_option_t cmdline_options[] =
+{
+ { "-autostartwithcolon", SET_RESOURCE, 0, NULL, NULL, "AutostartRunWithColon", (resource_value_t)1,
+ 0, IDCLS_ENABLE_AUTOSTARTWITHCOLON },
+ { "+autostartwithcolon", SET_RESOURCE, 0, NULL, NULL, "AutostartRunWithColon", (resource_value_t)0,
+ 0, IDCLS_DISABLE_AUTOSTARTWITHCOLON },
+ { NULL }
+};
+#else
+static const cmdline_option_t cmdline_options[] =
+{
+ { "-autostartwithcolon", SET_RESOURCE, 0, NULL, NULL, "AutostartRunWithColon", (resource_value_t)1,
+ NULL, N_("On autostart, use the 'RUN' command with a colon, i.e., 'RUN:'") },
+ { "+autostartwithcolon", SET_RESOURCE, 0, NULL, NULL, "AutostartRunWithColon", (resource_value_t)0,
+ NULL, N_("On autostart, do not use the 'RUN' command with a colon; i.e., 'RUN'") },
+ { NULL }
+};
+#endif
+
+/*! \brief initialize the command-line options
+
+ \return
+ 0 on success, else -1.
+
+ \remark
+ Registers the command-line options
+*/
+int autostart_cmdline_options_init(void)
+{
+ return cmdline_register_options(cmdline_options);
+}
+
+/* ------------------------------------------------------------------------- */
+
/* Deallocate program name if we have one */
static void deallocate_program_name(void)
{
@@ -273,7 +357,7 @@
static void disk_attention_callback(void)
{
if (autostart_run_mode == AUTOSTART_MODE_RUN)
- kbdbuf_feed("RUN:\r");
+ kbdbuf_feed(AutostartRunCommand);
machine_bus_attention_callback_set(NULL);
@@ -333,7 +417,7 @@
switch (check("READY.", AUTOSTART_WAIT_BLINK)) {
case YES:
log_message(autostart_log, "Starting program.");
- kbdbuf_feed("RUN:\r");
+ kbdbuf_feed(AutostartRunCommand);
autostartmode = AUTOSTART_DONE;
break;
case NO:
@@ -382,7 +466,7 @@
if (!traps) {
if (autostart_run_mode == AUTOSTART_MODE_RUN)
- kbdbuf_feed("RUN:\r");
+ kbdbuf_feed(AutostartRunCommand);
autostartmode = AUTOSTART_DONE;
} else {
autostartmode = AUTOSTART_LOADINGDISK;
Modified: trunk/vice/src/autostart.h
===================================================================
--- trunk/vice/src/autostart.h 2008-07-07 17:55:09 UTC (rev 18966)
+++ trunk/vice/src/autostart.h 2008-07-07 18:15:00 UTC (rev 18967)
@@ -34,6 +34,9 @@
#define AUTOSTART_MODE_RUN 0
#define AUTOSTART_MODE_LOAD 1
+extern int autostart_resources_init(void);
+extern int autostart_cmdline_options_init(void);
+
extern int autostart_init(CLOCK min_cycles, int handle_drive_true_emulation,
int blnsw, int pnt, int pntr, int lnmx);
extern void autostart_shutdown(void);
Modified: trunk/vice/src/init.c
===================================================================
--- trunk/vice/src/init.c 2008-07-07 17:55:09 UTC (rev 18966)
+++ trunk/vice/src/init.c 2008-07-07 18:15:00 UTC (rev 18967)
@@ -29,6 +29,7 @@
#include "archdep.h"
#include "attach.h"
+#include "autostart.h"
#include "cmdline.h"
#include "console.h"
#include "debug.h"
@@ -81,6 +82,10 @@
init_resource_fail("system file locator");
return -1;
}
+ if (autostart_resources_init() < 0) {
+ init_resource_fail("autostart");
+ return -1;
+ }
if (romset_resources_init() < 0) {
init_resource_fail("romset");
return -1;
@@ -166,6 +171,10 @@
init_cmdline_options_fail("UI");
return -1;
}
+ if (autostart_cmdline_options_init() < 0) {
+ init_resource_fail("autostart");
+ return -1;
+ }
if (fliplist_cmdline_options_init() < 0) {
init_cmdline_options_fail("flip list");
return -1;
Modified: trunk/vice/src/translate.c
===================================================================
--- trunk/vice/src/translate.c 2008-07-07 17:55:09 UTC (rev 18966)
+++ trunk/vice/src/translate.c 2008-07-07 18:15:00 UTC (rev 18967)
@@ -657,6 +657,26 @@
/* ------------------------ COMMAND LINE OPTION STRINGS -------------------- */
+/* autostart.c */
+/* en */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON, "On autostart, use the 'RUN' command with a colon, i.e., 'RUN:'"},
+/* de */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_DE, ""}, /* fuzzy */
+/* fr */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_FR, ""}, /* fuzzy */
+/* hu */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_HU, ""}, /* fuzzy */
+/* it */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_IT, ""}, /* fuzzy */
+/* nl */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_NL, ""}, /* fuzzy */
+/* pl */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_PL, ""}, /* fuzzy */
+/* sv */ {IDCLS_ENABLE_AUTOSTARTWITHCOLON_SV, ""}, /* fuzzy */
+
+/* autostart.c */
+/* en */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON, "On autostart, do not use the 'RUN' command with a colon; i.e., 'RUN'"},
+/* de */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_DE, ""}, /* fuzzy */
+/* fr */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_FR, ""}, /* fuzzy */
+/* hu */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_HU, ""}, /* fuzzy */
+/* it */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_IT, ""}, /* fuzzy */
+/* nl */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_NL, ""}, /* fuzzy */
+/* pl */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_PL, ""}, /* fuzzy */
+/* sv */ {IDCLS_DISABLE_AUTOSTARTWITHCOLON_SV, ""}, /* fuzzy */
+
/* c128/c128-cmdline-options.c, c64/c64-cmdline-options.c,
c64/psid.c, plus4/plus4-cmdline-options.c,
vic20/vic20-cmdline-options.c */
Modified: trunk/vice/src/translate.txt
===================================================================
--- trunk/vice/src/translate.txt 2008-07-07 17:55:09 UTC (rev 18966)
+++ trunk/vice/src/translate.txt 2008-07-07 18:15:00 UTC (rev 18967)
@@ -163,6 +163,12 @@
/* COMMAND-LINE STRING ID DEFINITIONS */
+/* autostart.c */
+IDCLS_ENABLE_AUTOSTARTWITHCOLON
+
+/* autostart.c */
+IDCLS_DISABLE_AUTOSTARTWITHCOLON
+
/* c128/c128-cmdline-options.c, c64/c64-cmdline-options.c,
c64/psid.c, plus4/plus4-cmdline-options.c,
vic20/vic20-cmdline-options.c */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-07 17:55:39
|
Revision: 18966
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18966&view=rev
Author: blackystardust
Date: 2008-07-07 10:55:09 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
2008-07-07 Marco van den Heuvel <bla...@ya...>
* doc/html/plain/NEWS: Updated.
* src/arch/beos/Makefile.am, src/arch/beos/constants.h,
src/arch/beos/ui.cc, src/arch/beos/vicemenu.cc: Added copy/paste
support.
* src/arch/beos/console.c: Fixed a typo.
* src/arch/beos/ui_sid.cc: Added a missing variable.
* src/arch/os2/ui.c: Fixed a typo.
* src/arch/os2/vac++/incl/mainsrc.icc,
src/arch/os2/watcom/mainsrc.tgt, src/arch/os2/watcom/vice.wpj,
src/arch/win32/watcom/base.tgt, src/arch/win32/watcom/vice.wpj:
Added clipboard.c to the project files.
* src/clipboard.h: Changed the _CLIPBOARD_H define to
_VICE_CLIPBOARD_H so that it won't interfere with the beos
clipboard define.
* src/sound.h: Fixed up to return SWORD and use int calculations
without casts.
Modified Paths:
--------------
trunk/vice/ChangeLog
trunk/vice/doc/html/plain/NEWS
trunk/vice/src/ChangeLog
trunk/vice/src/arch/beos/Makefile.am
trunk/vice/src/arch/beos/console.c
trunk/vice/src/arch/beos/constants.h
trunk/vice/src/arch/beos/ui.cc
trunk/vice/src/arch/beos/ui_sid.cc
trunk/vice/src/arch/beos/vicemenu.cc
trunk/vice/src/arch/os2/ui.c
trunk/vice/src/arch/os2/vac++/incl/mainsrc.icc
trunk/vice/src/arch/os2/watcom/mainsrc.tgt
trunk/vice/src/arch/os2/watcom/vice.wpj
trunk/vice/src/arch/win32/watcom/base.tgt
trunk/vice/src/arch/win32/watcom/vice.wpj
trunk/vice/src/clipboard.h
trunk/vice/src/sound.h
Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/ChangeLog 2008-07-07 17:55:09 UTC (rev 18966)
@@ -1,3 +1,7 @@
+2008-07-07 Marco van den Heuvel <bla...@ya...>
+
+ * doc/html/plain/NEWS: Updated.
+
2008-07-04 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.23
Modified: trunk/vice/doc/html/plain/NEWS
===================================================================
--- trunk/vice/doc/html/plain/NEWS 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/doc/html/plain/NEWS 2008-07-07 17:55:09 UTC (rev 18966)
@@ -88,16 +88,22 @@
- Fixed mouse grab and xaw menu popup.
+- After a CPU jam user can select to resume emulation without
+ reset.
+
** MS-Windows changes
---------------------
- 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.
+- Added the ability to copy and paste text from and to the
+ VICE window.
-- keyboard shortcuts are definable in the configuration file
+- Added the ability to paste text into the VICE window by
+ right-clicking on the VICE window.
+
+- Keyboard shortcuts are definable in the configuration file
win_shortscuts.vsc
- After a CPU jam user can select to resume emulation without
@@ -117,12 +123,27 @@
- Added warning dialog when the monitor is accessed without
having an open console window.
+- Added the ability to copy and paste text from and to the
+ VICE window.
+
** AmigaOS changes
------------------
- Fixed the reverse logic of the -confirmexit/+confirmexit
command-line options.
+- Added the ability to copy and paste text from and to the
+ VICE window.
+
+- After a CPU jam user can select to resume emulation without
+ reset.
+
+** OS/2 changes
+---------------
+
+- After a CPU jam user can select to resume emulation without
+ reset.
+
** Miscellaneous changes
------------------------
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/ChangeLog 2008-07-07 17:55:09 UTC (rev 18966)
@@ -1,3 +1,26 @@
+2008-07-07 Marco van den Heuvel <bla...@ya...>
+
+ * arch/beos/Makefile.am, arch/beos/constants.h, arch/beos/ui.cc,
+ arch/beos/vicemenu.cc: Added copy/paste support.
+
+ * arch/beos/console.c: Fixed a typo.
+
+ * arch/beos/ui_sid.cc: Added a missing variable.
+
+ * arch/os2/ui.c: Fixed a typo.
+
+ * arch/os2/vac++/incl/mainsrc.icc, arch/os2/watcom/mainsrc.tgt,
+ arch/os2/watcom/vice.wpj, arch/win32/watcom/base.tgt,
+ arch/win32/watcom/vice.wpj: Added clipboard.c to the project
+ files.
+
+ * clipboard.h: Changed the _CLIPBOARD_H define to
+ _VICE_CLIPBOARD_H so that it won't interfere with the beos
+ clipboard define.
+
+ * sound.h: Fixed up to return SWORD and use int calculations
+ without casts.
+
2008-07-04 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.23
Modified: trunk/vice/src/arch/beos/Makefile.am
===================================================================
--- trunk/vice/src/arch/beos/Makefile.am 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/arch/beos/Makefile.am 2008-07-07 17:55:09 UTC (rev 18966)
@@ -8,6 +8,7 @@
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/drive \
-I$(top_srcdir)/src/vdrive \
+ -I$(top_srcdir)/src/monitor \
-I$(top_srcdir)/src/c64 \
-I$(top_srcdir)/src/c128 \
-I$(top_srcdir)/src/vic20 \
Modified: trunk/vice/src/arch/beos/console.c
===================================================================
--- trunk/vice/src/arch/beos/console.c 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/arch/beos/console.c 2008-07-07 17:55:09 UTC (rev 18966)
@@ -53,7 +53,7 @@
#else
char *readline(const char *prompt)
{
- char *p, *v;
+ char *p, *rv;
console_out(NULL, "%s", prompt);
fflush(stdout);
Modified: trunk/vice/src/arch/beos/constants.h
===================================================================
--- trunk/vice/src/arch/beos/constants.h 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/arch/beos/constants.h 2008-07-07 17:55:09 UTC (rev 18966)
@@ -111,6 +111,9 @@
const uint32 ATTACH_C64_CART = 'MA01';
const uint32 ATTACH_VIC20_CART = 'MA02';
+const uint32 MENU_COPY = 'M161';
+const uint32 MENU_PASTE = 'M162';
+
const uint32 MENU_TOGGLE_SOUND = 'M100';
const uint32 MENU_TOGGLE_WARP_MODE = 'M101';
const uint32 MENU_TOGGLE_DRIVE_TRUE_EMULATION = 'M102';
Modified: trunk/vice/src/arch/beos/ui.cc
===================================================================
--- trunk/vice/src/arch/beos/ui.cc 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/arch/beos/ui.cc 2008-07-07 17:55:09 UTC (rev 18966)
@@ -28,6 +28,7 @@
#include <Alert.h>
#include <Application.h>
+#include <Clipboard.h>
#include <FilePanel.h>
#include <Menu.h>
#include <MenuBar.h>
@@ -46,7 +47,9 @@
#include "attach.h"
#include "autostart.h"
#include "archdep.h"
+#include "charset.h"
#include "cmdline.h"
+#include "clipboard.h"
#include "constants.h"
#include "datasette.h"
#include "drive.h"
@@ -57,6 +60,7 @@
#include "interrupt.h"
#include "joy.h"
#include "kbd.h"
+#include "kbdbuf.h"
#include "keyboard.h"
#include "lib.h"
#include "log.h"
@@ -426,7 +430,56 @@
return is_paused;
}
+static void ui_copy_clipboard(void)
+{
+ BMessage *clippy = (BMessage *)NULL;
+ char *text = NULL;
+ text = clipboard_read_screen_output("\n");
+
+ if (text != NULL)
+ {
+ if (be_clipboard->Lock())
+ {
+ be_clipboard->Clear();
+ if (clippy = be_clipboard->Data())
+ {
+ clippy->AddData("text/plain", B_MIME_TYPE, text, strlen(text));
+ be_clipboard->Commit();
+ }
+ be_clipboard->Unlock();
+ }
+ lib_free(text);
+ }
+}
+
+static void ui_paste_clipboard_text(void)
+{
+ const char *text;
+ char *text_in_petscii = NULL;
+ int32 textlen = 0;
+ BMessage *clippy = (BMessage *)NULL;
+
+ if (be_clipboard->Lock())
+ {
+ if (clippy = be_clipboard->Data())
+ {
+ clippy->FindData("text/plain", B_MIME_TYPE, (const void **)&text, &textlen);
+
+ if (textlen != 0)
+ {
+ text_in_petscii = (char *)lib_malloc(textlen + 1);
+ memcpy(text_in_petscii, text, textlen);
+ text_in_petscii[textlen] = 0;
+ charset_petconvstring((unsigned char *)text_in_petscii, 0);
+ kbdbuf_feed(text_in_petscii);
+ lib_free(text_in_petscii);
+ }
+ }
+ be_clipboard->Unlock();
+ }
+}
+
/* here the stuff for queueing and dispatching ui commands */
/*---------------------------------------------------------*/
#define MAX_MESSAGE_QUEUE_SIZE 256
@@ -638,6 +691,12 @@
case MENU_PAUSE:
ui_pause_emulation();
break;
+ case MENU_COPY:
+ ui_copy_clipboard();
+ break;
+ case MENU_PASTE:
+ ui_paste_clipboard_text();
+ break;
case MENU_SOUND_RECORD_AIFF:
ui_select_file(windowlist[0]->savepanel,AIFF_FILE,(void*)0);
resources_set_string("SoundRecordDeviceName", "");
Modified: trunk/vice/src/arch/beos/ui_sid.cc
===================================================================
--- trunk/vice/src/arch/beos/ui_sid.cc 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/arch/beos/ui_sid.cc 2008-07-07 17:55:09 UTC (rev 18966)
@@ -88,12 +88,13 @@
void CreateAndGetAddressList(BListView *addresslistview, int mode)
{
- /* mode: 0=Create 1=get */
+ /* mode: 0=Create 1=get */
char st[12];
int res_value;
int adr, ladr, hi, index = -1;
int *hadr;
- int cursel = addresslistview->CurrentSelection();
+ int cursel = addresslistview->CurrentSelection();
+ BListItem *item;
resources_get_int("SidStereoAddressStart", &res_value);
Modified: trunk/vice/src/arch/beos/vicemenu.cc
===================================================================
--- trunk/vice/src/arch/beos/vicemenu.cc 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/arch/beos/vicemenu.cc 2008-07-07 17:55:09 UTC (rev 18966)
@@ -256,6 +256,16 @@
menu->AddItem(new BMenuItem("Quit",
new BMessage(MENU_EXIT_REQUESTED), 'Q'));
+ /* create the EDIT menu */
+ menu = new BMenu("Edit");
+ menubar->AddItem(menu);
+ if (!vsid_mode) {
+ menu->AddItem(new BMenuItem("Copy",
+ new BMessage(MENU_COPY)));
+ menu->AddItem(new BMenuItem("Paste",
+ new BMessage(MENU_PASTE)));
+ }
+
/* create the OPTIONS menu */
menu = new BMenu("Options");
menubar->AddItem(menu);
Modified: trunk/vice/src/arch/os2/ui.c
===================================================================
--- trunk/vice/src/arch/os2/ui.c 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/arch/os2/ui.c 2008-07-07 17:55:09 UTC (rev 18966)
@@ -358,7 +358,7 @@
mb->mb2d[0].idButton = UI_JAM_HARD_RESET;
mb->mb2d[1].idButton = UI_JAM_RESET;
mb->mb2d[2].idButton = UI_JAM_MONITOR;
- mb->mv2d[3].idButton = UI_JAM_NONE;
+ mb->mb2d[3].idButton = UI_JAM_NONE;
mb->mb2d[0].flStyle = BS_DEFAULT;
mb->mb2d[1].flStyle = 0;
mb->mb2d[2].flStyle = 0;
Modified: trunk/vice/src/arch/os2/vac++/incl/mainsrc.icc
===================================================================
--- trunk/vice/src/arch/os2/vac++/incl/mainsrc.icc 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/arch/os2/vac++/incl/mainsrc.icc 2008-07-07 17:55:09 UTC (rev 18966)
@@ -6,6 +6,7 @@
"cbmimage.c",
"clkguard.c",
"charset.c",
+ "clipboard.c",
"cmdline.c",
"datasette.c",
"debug.c",
Modified: trunk/vice/src/arch/os2/watcom/mainsrc.tgt
===================================================================
--- trunk/vice/src/arch/os2/watcom/mainsrc.tgt 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/arch/os2/watcom/mainsrc.tgt 2008-07-07 17:55:09 UTC (rev 18966)
@@ -42,7 +42,7 @@
0
10
WPickList
-44
+45
11
MItem
3
@@ -199,8 +199,8 @@
0
46
MItem
-19
-..\..\..\clkguard.c
+20
+..\..\..\clipboard.c
47
WString
4
@@ -217,8 +217,8 @@
0
50
MItem
-18
-..\..\..\cmdline.c
+19
+..\..\..\clkguard.c
51
WString
4
@@ -235,8 +235,8 @@
0
54
MItem
-20
-..\..\..\datasette.c
+18
+..\..\..\cmdline.c
55
WString
4
@@ -253,8 +253,8 @@
0
58
MItem
-16
-..\..\..\debug.c
+20
+..\..\..\datasette.c
59
WString
4
@@ -271,8 +271,8 @@
0
62
MItem
-14
-..\..\..\dma.c
+16
+..\..\..\debug.c
63
WString
4
@@ -289,8 +289,8 @@
0
66
MItem
-16
-..\..\..\emuid.c
+14
+..\..\..\dma.c
67
WString
4
@@ -308,7 +308,7 @@
70
MItem
16
-..\..\..\event.c
+..\..\..\emuid.c
71
WString
4
@@ -325,8 +325,8 @@
0
74
MItem
-19
-..\..\..\findpath.c
+16
+..\..\..\event.c
75
WString
4
@@ -344,7 +344,7 @@
78
MItem
19
-..\..\..\fliplist.c
+..\..\..\findpath.c
79
WString
4
@@ -361,8 +361,8 @@
0
82
MItem
-14
-..\..\..\gcr.c
+19
+..\..\..\fliplist.c
83
WString
4
@@ -379,8 +379,8 @@
0
86
MItem
-15
-..\..\..\init.c
+14
+..\..\..\gcr.c
87
WString
4
@@ -397,8 +397,8 @@
0
90
MItem
-22
-..\..\..\initcmdline.c
+15
+..\..\..\init.c
91
WString
4
@@ -415,8 +415,8 @@
0
94
MItem
-20
-..\..\..\interrupt.c
+22
+..\..\..\initcmdline.c
95
WString
4
@@ -433,8 +433,8 @@
0
98
MItem
-17
-..\..\..\ioutil.c
+20
+..\..\..\interrupt.c
99
WString
4
@@ -452,7 +452,7 @@
102
MItem
17
-..\..\..\kbdbuf.c
+..\..\..\ioutil.c
103
WString
4
@@ -469,8 +469,8 @@
0
106
MItem
-19
-..\..\..\keyboard.c
+17
+..\..\..\kbdbuf.c
107
WString
4
@@ -487,8 +487,8 @@
0
110
MItem
-14
-..\..\..\lib.c
+19
+..\..\..\keyboard.c
111
WString
4
@@ -505,8 +505,8 @@
0
114
MItem
-22
-..\..\..\machine-bus.c
+14
+..\..\..\lib.c
115
WString
4
@@ -523,8 +523,8 @@
0
118
MItem
-18
-..\..\..\machine.c
+22
+..\..\..\machine-bus.c
119
WString
4
@@ -541,8 +541,8 @@
0
122
MItem
-16
-..\..\..\mouse.c
+18
+..\..\..\machine.c
123
WString
4
@@ -559,8 +559,8 @@
0
126
MItem
-18
-..\..\..\network.c
+16
+..\..\..\mouse.c
127
WString
4
@@ -578,7 +578,7 @@
130
MItem
18
-..\..\..\palette.c
+..\..\..\network.c
131
WString
4
@@ -595,8 +595,8 @@
0
134
MItem
-14
-..\..\..\ram.c
+18
+..\..\..\palette.c
135
WString
4
@@ -613,8 +613,8 @@
0
138
MItem
-18
-..\..\..\rawfile.c
+14
+..\..\..\ram.c
139
WString
4
@@ -631,8 +631,8 @@
0
142
MItem
-20
-..\..\..\resources.c
+18
+..\..\..\rawfile.c
143
WString
4
@@ -649,8 +649,8 @@
0
146
MItem
-17
-..\..\..\romset.c
+20
+..\..\..\resources.c
147
WString
4
@@ -667,8 +667,8 @@
0
150
MItem
-21
-..\..\..\screenshot.c
+17
+..\..\..\romset.c
151
WString
4
@@ -685,8 +685,8 @@
0
154
MItem
-19
-..\..\..\snapshot.c
+21
+..\..\..\screenshot.c
155
WString
4
@@ -703,8 +703,8 @@
0
158
MItem
-16
-..\..\..\sound.c
+19
+..\..\..\snapshot.c
159
WString
4
@@ -721,8 +721,8 @@
0
162
MItem
-18
-..\..\..\sysfile.c
+16
+..\..\..\sound.c
163
WString
4
@@ -739,8 +739,8 @@
0
166
MItem
-20
-..\..\..\translate.c
+18
+..\..\..\sysfile.c
167
WString
4
@@ -757,8 +757,8 @@
0
170
MItem
-16
-..\..\..\traps.c
+20
+..\..\..\translate.c
171
WString
4
@@ -775,8 +775,8 @@
0
174
MItem
-15
-..\..\..\util.c
+16
+..\..\..\traps.c
175
WString
4
@@ -793,8 +793,8 @@
0
178
MItem
-16
-..\..\..\vsync.c
+15
+..\..\..\util.c
179
WString
4
@@ -812,7 +812,7 @@
182
MItem
16
-..\..\..\zfile.c
+..\..\..\vsync.c
183
WString
4
@@ -829,8 +829,8 @@
0
186
MItem
-18
-..\..\..\zipcode.c
+16
+..\..\..\zfile.c
187
WString
4
@@ -847,8 +847,8 @@
0
190
MItem
-12
-..\fullscr.c
+18
+..\..\..\zipcode.c
191
WString
4
@@ -863,3 +863,21 @@
1
1
0
+194
+MItem
+12
+..\fullscr.c
+195
+WString
+4
+COBJ
+196
+WVList
+0
+197
+WVList
+0
+11
+1
+1
+0
Modified: trunk/vice/src/arch/os2/watcom/vice.wpj
===================================================================
--- trunk/vice/src/arch/os2/watcom/vice.wpj 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/arch/os2/watcom/vice.wpj 2008-07-07 17:55:09 UTC (rev 18966)
@@ -916,14 +916,14 @@
1000
5700
4280
-1
0
+0
191
WFileName
11
mainsrc.tgt
0
-6
+0
192
VComponent
193
@@ -1258,7 +1258,7 @@
WFileName
7
x64.tgt
-24
+9
27
255
VComponent
@@ -1267,7 +1267,7 @@
2430
80
5700
-4293
+4280
1
0
257
@@ -1313,9 +1313,9 @@
265
WRect
3250
-13
+0
5700
-4293
+4280
1
0
266
@@ -1331,7 +1331,7 @@
3280
40
5700
-4293
+4280
1
0
269
@@ -1340,4 +1340,4 @@
xvic.tgt
0
6
-267
+189
Modified: trunk/vice/src/arch/win32/watcom/base.tgt
===================================================================
--- trunk/vice/src/arch/win32/watcom/base.tgt 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/arch/win32/watcom/base.tgt 2008-07-07 17:55:09 UTC (rev 18966)
@@ -42,7 +42,7 @@
0
10
WPickList
-48
+49
11
MItem
3
@@ -187,8 +187,8 @@
0
43
MItem
-19
-..\..\..\clkguard.c
+20
+..\..\..\clipboard.c
44
WString
4
@@ -205,8 +205,8 @@
0
47
MItem
-18
-..\..\..\cmdline.c
+19
+..\..\..\clkguard.c
48
WString
4
@@ -223,8 +223,8 @@
0
51
MItem
-16
-..\..\..\color.c
+18
+..\..\..\cmdline.c
52
WString
4
@@ -242,7 +242,7 @@
55
MItem
16
-..\..\..\crc32.c
+..\..\..\color.c
56
WString
4
@@ -259,8 +259,8 @@
0
59
MItem
-20
-..\..\..\datasette.c
+16
+..\..\..\crc32.c
60
WString
4
@@ -277,8 +277,8 @@
0
63
MItem
-16
-..\..\..\debug.c
+20
+..\..\..\datasette.c
64
WString
4
@@ -295,8 +295,8 @@
0
67
MItem
-14
-..\..\..\dma.c
+16
+..\..\..\debug.c
68
WString
4
@@ -313,8 +313,8 @@
0
71
MItem
-16
-..\..\..\emuid.c
+14
+..\..\..\dma.c
72
WString
4
@@ -332,7 +332,7 @@
75
MItem
16
-..\..\..\event.c
+..\..\..\emuid.c
76
WString
4
@@ -349,8 +349,8 @@
0
79
MItem
-19
-..\..\..\findpath.c
+16
+..\..\..\event.c
80
WString
4
@@ -368,7 +368,7 @@
83
MItem
19
-..\..\..\fliplist.c
+..\..\..\findpath.c
84
WString
4
@@ -385,8 +385,8 @@
0
87
MItem
-14
-..\..\..\gcr.c
+19
+..\..\..\fliplist.c
88
WString
4
@@ -403,8 +403,8 @@
0
91
MItem
-15
-..\..\..\info.c
+14
+..\..\..\gcr.c
92
WString
4
@@ -422,7 +422,7 @@
95
MItem
15
-..\..\..\init.c
+..\..\..\info.c
96
WString
4
@@ -439,8 +439,8 @@
0
99
MItem
-22
-..\..\..\initcmdline.c
+15
+..\..\..\init.c
100
WString
4
@@ -457,8 +457,8 @@
0
103
MItem
-20
-..\..\..\interrupt.c
+22
+..\..\..\initcmdline.c
104
WString
4
@@ -475,8 +475,8 @@
0
107
MItem
-17
-..\..\..\ioutil.c
+20
+..\..\..\interrupt.c
108
WString
4
@@ -493,8 +493,8 @@
0
111
MItem
-19
-..\..\..\joystick.c
+17
+..\..\..\ioutil.c
112
WString
4
@@ -511,8 +511,8 @@
0
115
MItem
-17
-..\..\..\kbdbuf.c
+19
+..\..\..\joystick.c
116
WString
4
@@ -529,8 +529,8 @@
0
119
MItem
-19
-..\..\..\keyboard.c
+17
+..\..\..\kbdbuf.c
120
WString
4
@@ -547,8 +547,8 @@
0
123
MItem
-14
-..\..\..\lib.c
+19
+..\..\..\keyboard.c
124
WString
4
@@ -566,7 +566,7 @@
127
MItem
14
-..\..\..\log.c
+..\..\..\lib.c
128
WString
4
@@ -583,8 +583,8 @@
0
131
MItem
-22
-..\..\..\machine-bus.c
+14
+..\..\..\log.c
132
WString
4
@@ -601,8 +601,8 @@
0
135
MItem
-18
-..\..\..\machine.c
+22
+..\..\..\machine-bus.c
136
WString
4
@@ -619,8 +619,8 @@
0
139
MItem
-16
-..\..\..\mouse.c
+18
+..\..\..\machine.c
140
WString
4
@@ -637,8 +637,8 @@
0
143
MItem
-18
-..\..\..\network.c
+16
+..\..\..\mouse.c
144
WString
4
@@ -656,7 +656,7 @@
147
MItem
18
-..\..\..\palette.c
+..\..\..\network.c
148
WString
4
@@ -673,8 +673,8 @@
0
151
MItem
-14
-..\..\..\ram.c
+18
+..\..\..\palette.c
152
WString
4
@@ -691,8 +691,8 @@
0
155
MItem
-18
-..\..\..\rawfile.c
+14
+..\..\..\ram.c
156
WString
4
@@ -709,8 +709,8 @@
0
159
MItem
-20
-..\..\..\resources.c
+18
+..\..\..\rawfile.c
160
WString
4
@@ -727,8 +727,8 @@
0
163
MItem
-17
-..\..\..\romset.c
+20
+..\..\..\resources.c
164
WString
4
@@ -745,8 +745,8 @@
0
167
MItem
-21
-..\..\..\screenshot.c
+17
+..\..\..\romset.c
168
WString
4
@@ -763,8 +763,8 @@
0
171
MItem
-19
-..\..\..\snapshot.c
+21
+..\..\..\screenshot.c
172
WString
4
@@ -781,8 +781,8 @@
0
175
MItem
-16
-..\..\..\sound.c
+19
+..\..\..\snapshot.c
176
WString
4
@@ -799,8 +799,8 @@
0
179
MItem
-18
-..\..\..\sysfile.c
+16
+..\..\..\sound.c
180
WString
4
@@ -817,8 +817,8 @@
0
183
MItem
-20
-..\..\..\translate.c
+18
+..\..\..\sysfile.c
184
WString
4
@@ -835,8 +835,8 @@
0
187
MItem
-16
-..\..\..\traps.c
+20
+..\..\..\translate.c
188
WString
4
@@ -853,8 +853,8 @@
0
191
MItem
-15
-..\..\..\util.c
+16
+..\..\..\traps.c
192
WString
4
@@ -871,8 +871,8 @@
0
195
MItem
-16
-..\..\..\vsync.c
+15
+..\..\..\util.c
196
WString
4
@@ -890,7 +890,7 @@
199
MItem
16
-..\..\..\zfile.c
+..\..\..\vsync.c
200
WString
4
@@ -907,8 +907,8 @@
0
203
MItem
-18
-..\..\..\zipcode.c
+16
+..\..\..\zfile.c
204
WString
4
@@ -923,3 +923,21 @@
1
1
0
+207
+MItem
+18
+..\..\..\zipcode.c
+208
+WString
+4
+COBJ
+209
+WVList
+0
+210
+WVList
+0
+11
+1
+1
+0
Modified: trunk/vice/src/arch/win32/watcom/vice.wpj
===================================================================
--- trunk/vice/src/arch/win32/watcom/vice.wpj 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/arch/win32/watcom/vice.wpj 2008-07-07 17:55:09 UTC (rev 18966)
@@ -4,10 +4,10 @@
VpeMain
1
WRect
-0
-0
+-40
+-53
10320
-9960
+9973
2
MProject
3
@@ -280,8 +280,8 @@
0
5700
4280
-1
0
+0
68
WFileName
8
@@ -325,7 +325,7 @@
76
WRect
750
-733
+720
5700
4280
1
@@ -421,7 +421,7 @@
94
WRect
750
-733
+720
5700
4280
1
@@ -517,7 +517,7 @@
112
WRect
750
-733
+720
5700
4280
1
@@ -613,7 +613,7 @@
130
WRect
750
-733
+720
5700
4280
1
@@ -709,7 +709,7 @@
148
WRect
750
-733
+720
5700
4280
1
@@ -805,7 +805,7 @@
166
WRect
750
-733
+720
5700
4280
1
@@ -901,7 +901,7 @@
184
WRect
750
-733
+720
5700
4280
1
@@ -917,7 +917,7 @@
187
WRect
4390
-93
+80
5700
4280
1
@@ -1029,7 +1029,7 @@
208
WRect
4490
-53
+40
5700
4280
1
@@ -1040,4 +1040,4 @@
xvic.tgt
13
29
-207
+66
Modified: trunk/vice/src/clipboard.h
===================================================================
--- trunk/vice/src/clipboard.h 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/clipboard.h 2008-07-07 17:55:09 UTC (rev 18966)
@@ -25,8 +25,8 @@
*
*/
-#ifndef _CLIPBOARD_H
-#define _CLIPBOARD_H
+#ifndef _VICE_CLIPBOARD_H
+#define _VICE_CLIPBOARD_H
#include "vice.h"
Modified: trunk/vice/src/sound.h
===================================================================
--- trunk/vice/src/sound.h 2008-07-06 18:31:30 UTC (rev 18965)
+++ trunk/vice/src/sound.h 2008-07-07 17:55:09 UTC (rev 18966)
@@ -88,18 +88,18 @@
static inline SWORD sound_audio_mix(int ch1, int ch2)
{
if (ch1 == 0)
- return ch2;
+ return (SWORD)ch2;
if (ch2 == 0)
- return ch1;
+ return (SWORD)ch1;
if ((ch1 > 0 && ch2 < 0) || (ch1 < 0 && ch2 >0))
- return ch1+ch2;
+ return (SWORD)ch1+ch2;
if (ch1 > 0)
- return (SWORD)((SDWORD)(ch1 + ch2) - (SDWORD)(ch1 * ch2 / 32768));
+ return (SWORD)((ch1 + ch2) - (ch1 * ch2 / 32768));
- return (SWORD)-((SDWORD)(-(ch1) + -(ch2)) - (SDWORD)(-(ch1) * -(ch2) / 32768));
+ return (SWORD)-((-(ch1) + -(ch2)) - (-(ch1) * -(ch2) / 32768));
}
/* Sound adjustment types. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-06 18:31:25
|
Revision: 18965
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18965&view=rev
Author: blackystardust
Date: 2008-07-06 11:31:30 -0700 (Sun, 06 Jul 2008)
Log Message:
-----------
updated clipboard.c to the current trunk version.
Modified Paths:
--------------
branches/marco/ports/vice/src/arch/beos/Makefile.am
branches/marco/ports/vice/src/clipboard.c
Modified: branches/marco/ports/vice/src/arch/beos/Makefile.am
===================================================================
--- branches/marco/ports/vice/src/arch/beos/Makefile.am 2008-07-06 07:32:14 UTC (rev 18964)
+++ branches/marco/ports/vice/src/arch/beos/Makefile.am 2008-07-06 18:31:30 UTC (rev 18965)
@@ -8,7 +8,7 @@
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/drive \
-I$(top_srcdir)/src/vdrive \
- -I$(top_srcdir)/src/monitor \
+ -I$(top_srcdir)/src/monitor \
-I$(top_srcdir)/src/c64 \
-I$(top_srcdir)/src/c128 \
-I$(top_srcdir)/src/vic20 \
Modified: branches/marco/ports/vice/src/clipboard.c
===================================================================
--- branches/marco/ports/vice/src/clipboard.c 2008-07-06 07:32:14 UTC (rev 18964)
+++ branches/marco/ports/vice/src/clipboard.c 2008-07-06 18:31:30 UTC (rev 18965)
@@ -44,13 +44,14 @@
BYTE allrows, allcols;
unsigned int row, col;
unsigned int size;
+ unsigned int line_ending_length = strlen(line_ending);
+ unsigned int i;
int bank;
- int i;
char * p;
mem_get_screen_parameter(&base, &allrows, &allcols, &bank);
- size = allrows * (allcols + strlen(line_ending)) + 1;
+ size = allrows * (allcols + line_ending_length) + 1;
outputbuffer = lib_malloc(size);
if (outputbuffer == NULL) {
@@ -82,7 +83,7 @@
/* add a line-ending */
- for (i = 0; i < strlen(line_ending); i++)
+ for (i = 0; i < line_ending_length; i++)
*p++ = line_ending[i];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-06 07:32:06
|
Revision: 18964
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18964&view=rev
Author: blackystardust
Date: 2008-07-06 00:32:14 -0700 (Sun, 06 Jul 2008)
Log Message:
-----------
Updated the NEWS file
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-07-05 20:04:40 UTC (rev 18963)
+++ branches/marco/ports/vice/doc/html/plain/NEWS 2008-07-06 07:32:14 UTC (rev 18964)
@@ -88,16 +88,22 @@
- Fixed mouse grab and xaw menu popup.
+- After a CPU jam user can select to resume emulation without
+ reset.
+
** MS-Windows changes
---------------------
- 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.
+- Added the ability to copy and paste text from and to the
+ VICE window.
-- keyboard shortcuts are definable in the configuration file
+- Added the ability to paste text into the VICE window by
+ right-clicking on the VICE window.
+
+- Keyboard shortcuts are definable in the configuration file
win_shortscuts.vsc
- After a CPU jam user can select to resume emulation without
@@ -117,12 +123,27 @@
- Added warning dialog when the monitor is accessed without
having an open console window.
+- Added the ability to copy and paste text from and to the
+ VICE window.
+
** AmigaOS changes
------------------
- Fixed the reverse logic of the -confirmexit/+confirmexit
command-line options.
+- Added the ability to copy and paste text from and to the
+ VICE window.
+
+- After a CPU jam user can select to resume emulation without
+ reset.
+
+** OS/2 changes
+---------------
+
+- After a CPU jam user can select to resume emulation without
+ reset.
+
** Miscellaneous changes
------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-05 20:04:33
|
Revision: 18963
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18963&view=rev
Author: blackystardust
Date: 2008-07-05 13:04:40 -0700 (Sat, 05 Jul 2008)
Log Message:
-----------
Added the new clipboard.c file to the win32 and os/2 watcom project and to the os/2 vac++ project.
Modified Paths:
--------------
branches/marco/ports/vice/src/arch/os2/ui.c
branches/marco/ports/vice/src/arch/os2/vac++/incl/mainsrc.icc
branches/marco/ports/vice/src/arch/os2/watcom/mainsrc.tgt
branches/marco/ports/vice/src/arch/os2/watcom/vice.wpj
branches/marco/ports/vice/src/arch/win32/watcom/base.tgt
branches/marco/ports/vice/src/arch/win32/watcom/vice.wpj
branches/marco/ports/vice/src/sound.h
Modified: branches/marco/ports/vice/src/arch/os2/ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/os2/ui.c 2008-07-04 23:48:22 UTC (rev 18962)
+++ branches/marco/ports/vice/src/arch/os2/ui.c 2008-07-05 20:04:40 UTC (rev 18963)
@@ -358,7 +358,7 @@
mb->mb2d[0].idButton = UI_JAM_HARD_RESET;
mb->mb2d[1].idButton = UI_JAM_RESET;
mb->mb2d[2].idButton = UI_JAM_MONITOR;
- mb->mv2d[3].idButton = UI_JAM_NONE;
+ mb->mb2d[3].idButton = UI_JAM_NONE;
mb->mb2d[0].flStyle = BS_DEFAULT;
mb->mb2d[1].flStyle = 0;
mb->mb2d[2].flStyle = 0;
Modified: branches/marco/ports/vice/src/arch/os2/vac++/incl/mainsrc.icc
===================================================================
--- branches/marco/ports/vice/src/arch/os2/vac++/incl/mainsrc.icc 2008-07-04 23:48:22 UTC (rev 18962)
+++ branches/marco/ports/vice/src/arch/os2/vac++/incl/mainsrc.icc 2008-07-05 20:04:40 UTC (rev 18963)
@@ -6,6 +6,7 @@
"cbmimage.c",
"clkguard.c",
"charset.c",
+ "clipboard.c",
"cmdline.c",
"datasette.c",
"debug.c",
Modified: branches/marco/ports/vice/src/arch/os2/watcom/mainsrc.tgt
===================================================================
--- branches/marco/ports/vice/src/arch/os2/watcom/mainsrc.tgt 2008-07-04 23:48:22 UTC (rev 18962)
+++ branches/marco/ports/vice/src/arch/os2/watcom/mainsrc.tgt 2008-07-05 20:04:40 UTC (rev 18963)
@@ -42,7 +42,7 @@
0
10
WPickList
-44
+45
11
MItem
3
@@ -199,8 +199,8 @@
0
46
MItem
-19
-..\..\..\clkguard.c
+20
+..\..\..\clipboard.c
47
WString
4
@@ -217,8 +217,8 @@
0
50
MItem
-18
-..\..\..\cmdline.c
+19
+..\..\..\clkguard.c
51
WString
4
@@ -235,8 +235,8 @@
0
54
MItem
-20
-..\..\..\datasette.c
+18
+..\..\..\cmdline.c
55
WString
4
@@ -253,8 +253,8 @@
0
58
MItem
-16
-..\..\..\debug.c
+20
+..\..\..\datasette.c
59
WString
4
@@ -271,8 +271,8 @@
0
62
MItem
-14
-..\..\..\dma.c
+16
+..\..\..\debug.c
63
WString
4
@@ -289,8 +289,8 @@
0
66
MItem
-16
-..\..\..\emuid.c
+14
+..\..\..\dma.c
67
WString
4
@@ -308,7 +308,7 @@
70
MItem
16
-..\..\..\event.c
+..\..\..\emuid.c
71
WString
4
@@ -325,8 +325,8 @@
0
74
MItem
-19
-..\..\..\findpath.c
+16
+..\..\..\event.c
75
WString
4
@@ -344,7 +344,7 @@
78
MItem
19
-..\..\..\fliplist.c
+..\..\..\findpath.c
79
WString
4
@@ -361,8 +361,8 @@
0
82
MItem
-14
-..\..\..\gcr.c
+19
+..\..\..\fliplist.c
83
WString
4
@@ -379,8 +379,8 @@
0
86
MItem
-15
-..\..\..\init.c
+14
+..\..\..\gcr.c
87
WString
4
@@ -397,8 +397,8 @@
0
90
MItem
-22
-..\..\..\initcmdline.c
+15
+..\..\..\init.c
91
WString
4
@@ -415,8 +415,8 @@
0
94
MItem
-20
-..\..\..\interrupt.c
+22
+..\..\..\initcmdline.c
95
WString
4
@@ -433,8 +433,8 @@
0
98
MItem
-17
-..\..\..\ioutil.c
+20
+..\..\..\interrupt.c
99
WString
4
@@ -452,7 +452,7 @@
102
MItem
17
-..\..\..\kbdbuf.c
+..\..\..\ioutil.c
103
WString
4
@@ -469,8 +469,8 @@
0
106
MItem
-19
-..\..\..\keyboard.c
+17
+..\..\..\kbdbuf.c
107
WString
4
@@ -487,8 +487,8 @@
0
110
MItem
-14
-..\..\..\lib.c
+19
+..\..\..\keyboard.c
111
WString
4
@@ -505,8 +505,8 @@
0
114
MItem
-22
-..\..\..\machine-bus.c
+14
+..\..\..\lib.c
115
WString
4
@@ -523,8 +523,8 @@
0
118
MItem
-18
-..\..\..\machine.c
+22
+..\..\..\machine-bus.c
119
WString
4
@@ -541,8 +541,8 @@
0
122
MItem
-16
-..\..\..\mouse.c
+18
+..\..\..\machine.c
123
WString
4
@@ -559,8 +559,8 @@
0
126
MItem
-18
-..\..\..\network.c
+16
+..\..\..\mouse.c
127
WString
4
@@ -578,7 +578,7 @@
130
MItem
18
-..\..\..\palette.c
+..\..\..\network.c
131
WString
4
@@ -595,8 +595,8 @@
0
134
MItem
-14
-..\..\..\ram.c
+18
+..\..\..\palette.c
135
WString
4
@@ -613,8 +613,8 @@
0
138
MItem
-18
-..\..\..\rawfile.c
+14
+..\..\..\ram.c
139
WString
4
@@ -631,8 +631,8 @@
0
142
MItem
-20
-..\..\..\resources.c
+18
+..\..\..\rawfile.c
143
WString
4
@@ -649,8 +649,8 @@
0
146
MItem
-17
-..\..\..\romset.c
+20
+..\..\..\resources.c
147
WString
4
@@ -667,8 +667,8 @@
0
150
MItem
-21
-..\..\..\screenshot.c
+17
+..\..\..\romset.c
151
WString
4
@@ -685,8 +685,8 @@
0
154
MItem
-19
-..\..\..\snapshot.c
+21
+..\..\..\screenshot.c
155
WString
4
@@ -703,8 +703,8 @@
0
158
MItem
-16
-..\..\..\sound.c
+19
+..\..\..\snapshot.c
159
WString
4
@@ -721,8 +721,8 @@
0
162
MItem
-18
-..\..\..\sysfile.c
+16
+..\..\..\sound.c
163
WString
4
@@ -739,8 +739,8 @@
0
166
MItem
-20
-..\..\..\translate.c
+18
+..\..\..\sysfile.c
167
WString
4
@@ -757,8 +757,8 @@
0
170
MItem
-16
-..\..\..\traps.c
+20
+..\..\..\translate.c
171
WString
4
@@ -775,8 +775,8 @@
0
174
MItem
-15
-..\..\..\util.c
+16
+..\..\..\traps.c
175
WString
4
@@ -793,8 +793,8 @@
0
178
MItem
-16
-..\..\..\vsync.c
+15
+..\..\..\util.c
179
WString
4
@@ -812,7 +812,7 @@
182
MItem
16
-..\..\..\zfile.c
+..\..\..\vsync.c
183
WString
4
@@ -829,8 +829,8 @@
0
186
MItem
-18
-..\..\..\zipcode.c
+16
+..\..\..\zfile.c
187
WString
4
@@ -847,8 +847,8 @@
0
190
MItem
-12
-..\fullscr.c
+18
+..\..\..\zipcode.c
191
WString
4
@@ -863,3 +863,21 @@
1
1
0
+194
+MItem
+12
+..\fullscr.c
+195
+WString
+4
+COBJ
+196
+WVList
+0
+197
+WVList
+0
+11
+1
+1
+0
Modified: branches/marco/ports/vice/src/arch/os2/watcom/vice.wpj
===================================================================
--- branches/marco/ports/vice/src/arch/os2/watcom/vice.wpj 2008-07-04 23:48:22 UTC (rev 18962)
+++ branches/marco/ports/vice/src/arch/os2/watcom/vice.wpj 2008-07-05 20:04:40 UTC (rev 18963)
@@ -916,14 +916,14 @@
1000
5700
4280
-1
0
+0
191
WFileName
11
mainsrc.tgt
0
-6
+0
192
VComponent
193
@@ -1258,7 +1258,7 @@
WFileName
7
x64.tgt
-24
+9
27
255
VComponent
@@ -1267,7 +1267,7 @@
2430
80
5700
-4293
+4280
1
0
257
@@ -1313,9 +1313,9 @@
265
WRect
3250
-13
+0
5700
-4293
+4280
1
0
266
@@ -1331,7 +1331,7 @@
3280
40
5700
-4293
+4280
1
0
269
@@ -1340,4 +1340,4 @@
xvic.tgt
0
6
-267
+189
Modified: branches/marco/ports/vice/src/arch/win32/watcom/base.tgt
===================================================================
--- branches/marco/ports/vice/src/arch/win32/watcom/base.tgt 2008-07-04 23:48:22 UTC (rev 18962)
+++ branches/marco/ports/vice/src/arch/win32/watcom/base.tgt 2008-07-05 20:04:40 UTC (rev 18963)
@@ -42,7 +42,7 @@
0
10
WPickList
-48
+49
11
MItem
3
@@ -187,8 +187,8 @@
0
43
MItem
-19
-..\..\..\clkguard.c
+20
+..\..\..\clipboard.c
44
WString
4
@@ -205,8 +205,8 @@
0
47
MItem
-18
-..\..\..\cmdline.c
+19
+..\..\..\clkguard.c
48
WString
4
@@ -223,8 +223,8 @@
0
51
MItem
-16
-..\..\..\color.c
+18
+..\..\..\cmdline.c
52
WString
4
@@ -242,7 +242,7 @@
55
MItem
16
-..\..\..\crc32.c
+..\..\..\color.c
56
WString
4
@@ -259,8 +259,8 @@
0
59
MItem
-20
-..\..\..\datasette.c
+16
+..\..\..\crc32.c
60
WString
4
@@ -277,8 +277,8 @@
0
63
MItem
-16
-..\..\..\debug.c
+20
+..\..\..\datasette.c
64
WString
4
@@ -295,8 +295,8 @@
0
67
MItem
-14
-..\..\..\dma.c
+16
+..\..\..\debug.c
68
WString
4
@@ -313,8 +313,8 @@
0
71
MItem
-16
-..\..\..\emuid.c
+14
+..\..\..\dma.c
72
WString
4
@@ -332,7 +332,7 @@
75
MItem
16
-..\..\..\event.c
+..\..\..\emuid.c
76
WString
4
@@ -349,8 +349,8 @@
0
79
MItem
-19
-..\..\..\findpath.c
+16
+..\..\..\event.c
80
WString
4
@@ -368,7 +368,7 @@
83
MItem
19
-..\..\..\fliplist.c
+..\..\..\findpath.c
84
WString
4
@@ -385,8 +385,8 @@
0
87
MItem
-14
-..\..\..\gcr.c
+19
+..\..\..\fliplist.c
88
WString
4
@@ -403,8 +403,8 @@
0
91
MItem
-15
-..\..\..\info.c
+14
+..\..\..\gcr.c
92
WString
4
@@ -422,7 +422,7 @@
95
MItem
15
-..\..\..\init.c
+..\..\..\info.c
96
WString
4
@@ -439,8 +439,8 @@
0
99
MItem
-22
-..\..\..\initcmdline.c
+15
+..\..\..\init.c
100
WString
4
@@ -457,8 +457,8 @@
0
103
MItem
-20
-..\..\..\interrupt.c
+22
+..\..\..\initcmdline.c
104
WString
4
@@ -475,8 +475,8 @@
0
107
MItem
-17
-..\..\..\ioutil.c
+20
+..\..\..\interrupt.c
108
WString
4
@@ -493,8 +493,8 @@
0
111
MItem
-19
-..\..\..\joystick.c
+17
+..\..\..\ioutil.c
112
WString
4
@@ -511,8 +511,8 @@
0
115
MItem
-17
-..\..\..\kbdbuf.c
+19
+..\..\..\joystick.c
116
WString
4
@@ -529,8 +529,8 @@
0
119
MItem
-19
-..\..\..\keyboard.c
+17
+..\..\..\kbdbuf.c
120
WString
4
@@ -547,8 +547,8 @@
0
123
MItem
-14
-..\..\..\lib.c
+19
+..\..\..\keyboard.c
124
WString
4
@@ -566,7 +566,7 @@
127
MItem
14
-..\..\..\log.c
+..\..\..\lib.c
128
WString
4
@@ -583,8 +583,8 @@
0
131
MItem
-22
-..\..\..\machine-bus.c
+14
+..\..\..\log.c
132
WString
4
@@ -601,8 +601,8 @@
0
135
MItem
-18
-..\..\..\machine.c
+22
+..\..\..\machine-bus.c
136
WString
4
@@ -619,8 +619,8 @@
0
139
MItem
-16
-..\..\..\mouse.c
+18
+..\..\..\machine.c
140
WString
4
@@ -637,8 +637,8 @@
0
143
MItem
-18
-..\..\..\network.c
+16
+..\..\..\mouse.c
144
WString
4
@@ -656,7 +656,7 @@
147
MItem
18
-..\..\..\palette.c
+..\..\..\network.c
148
WString
4
@@ -673,8 +673,8 @@
0
151
MItem
-14
-..\..\..\ram.c
+18
+..\..\..\palette.c
152
WString
4
@@ -691,8 +691,8 @@
0
155
MItem
-18
-..\..\..\rawfile.c
+14
+..\..\..\ram.c
156
WString
4
@@ -709,8 +709,8 @@
0
159
MItem
-20
-..\..\..\resources.c
+18
+..\..\..\rawfile.c
160
WString
4
@@ -727,8 +727,8 @@
0
163
MItem
-17
-..\..\..\romset.c
+20
+..\..\..\resources.c
164
WString
4
@@ -745,8 +745,8 @@
0
167
MItem
-21
-..\..\..\screenshot.c
+17
+..\..\..\romset.c
168
WString
4
@@ -763,8 +763,8 @@
0
171
MItem
-19
-..\..\..\snapshot.c
+21
+..\..\..\screenshot.c
172
WString
4
@@ -781,8 +781,8 @@
0
175
MItem
-16
-..\..\..\sound.c
+19
+..\..\..\snapshot.c
176
WString
4
@@ -799,8 +799,8 @@
0
179
MItem
-18
-..\..\..\sysfile.c
+16
+..\..\..\sound.c
180
WString
4
@@ -817,8 +817,8 @@
0
183
MItem
-20
-..\..\..\translate.c
+18
+..\..\..\sysfile.c
184
WString
4
@@ -835,8 +835,8 @@
0
187
MItem
-16
-..\..\..\traps.c
+20
+..\..\..\translate.c
188
WString
4
@@ -853,8 +853,8 @@
0
191
MItem
-15
-..\..\..\util.c
+16
+..\..\..\traps.c
192
WString
4
@@ -871,8 +871,8 @@
0
195
MItem
-16
-..\..\..\vsync.c
+15
+..\..\..\util.c
196
WString
4
@@ -890,7 +890,7 @@
199
MItem
16
-..\..\..\zfile.c
+..\..\..\vsync.c
200
WString
4
@@ -907,8 +907,8 @@
0
203
MItem
-18
-..\..\..\zipcode.c
+16
+..\..\..\zfile.c
204
WString
4
@@ -923,3 +923,21 @@
1
1
0
+207
+MItem
+18
+..\..\..\zipcode.c
+208
+WString
+4
+COBJ
+209
+WVList
+0
+210
+WVList
+0
+11
+1
+1
+0
Modified: branches/marco/ports/vice/src/arch/win32/watcom/vice.wpj
===================================================================
--- branches/marco/ports/vice/src/arch/win32/watcom/vice.wpj 2008-07-04 23:48:22 UTC (rev 18962)
+++ branches/marco/ports/vice/src/arch/win32/watcom/vice.wpj 2008-07-05 20:04:40 UTC (rev 18963)
@@ -4,10 +4,10 @@
VpeMain
1
WRect
-0
-0
+-40
+-53
10320
-9960
+9973
2
MProject
3
@@ -280,8 +280,8 @@
0
5700
4280
-1
0
+0
68
WFileName
8
@@ -325,7 +325,7 @@
76
WRect
750
-733
+720
5700
4280
1
@@ -421,7 +421,7 @@
94
WRect
750
-733
+720
5700
4280
1
@@ -517,7 +517,7 @@
112
WRect
750
-733
+720
5700
4280
1
@@ -613,7 +613,7 @@
130
WRect
750
-733
+720
5700
4280
1
@@ -709,7 +709,7 @@
148
WRect
750
-733
+720
5700
4280
1
@@ -805,7 +805,7 @@
166
WRect
750
-733
+720
5700
4280
1
@@ -901,7 +901,7 @@
184
WRect
750
-733
+720
5700
4280
1
@@ -917,7 +917,7 @@
187
WRect
4390
-93
+80
5700
4280
1
@@ -1029,7 +1029,7 @@
208
WRect
4490
-53
+40
5700
4280
1
@@ -1040,4 +1040,4 @@
xvic.tgt
13
29
-207
+66
Modified: branches/marco/ports/vice/src/sound.h
===================================================================
--- branches/marco/ports/vice/src/sound.h 2008-07-04 23:48:22 UTC (rev 18962)
+++ branches/marco/ports/vice/src/sound.h 2008-07-05 20:04:40 UTC (rev 18963)
@@ -88,18 +88,18 @@
static inline SWORD sound_audio_mix(int ch1, int ch2)
{
if (ch1 == 0)
- return ch2;
+ return (SWORD)ch2;
if (ch2 == 0)
- return ch1;
+ return (SWORD)ch1;
if ((ch1 > 0 && ch2 < 0) || (ch1 < 0 && ch2 >0))
- return ch1+ch2;
+ return (SWORD)ch1+ch2;
if (ch1 > 0)
- return (SWORD)((SDWORD)(ch1 + ch2) - (SDWORD)(ch1 * ch2 / 32768));
+ return (SWORD)((ch1 + ch2) - (ch1 * ch2 / 32768));
- return (SWORD)-((SDWORD)(-(ch1) + -(ch2)) - (SDWORD)(-(ch1) * -(ch2) / 32768));
+ return (SWORD)-((-(ch1) + -(ch2)) - (-(ch1) * -(ch2) / 32768));
}
/* Sound adjustment types. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-04 23:48:16
|
Revision: 18962
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18962&view=rev
Author: blackystardust
Date: 2008-07-04 16:48:22 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Updated to 1.22.23
Modified Paths:
--------------
branches/marco/ports/vice/ChangeLog
branches/marco/ports/vice/Makefile.am
branches/marco/ports/vice/configure.in
branches/marco/ports/vice/doc/html/Makefile.am
branches/marco/ports/vice/doc/html/plain/BUGS
branches/marco/ports/vice/doc/html/plain/NEWS
branches/marco/ports/vice/src/ChangeLog
branches/marco/ports/vice/src/arch/unix/archdep.c
branches/marco/ports/vice/src/arch/unix/macosx/Makefile.am
branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am
branches/marco/ports/vice/src/arch/unix/tfearch.c
branches/marco/ports/vice/src/arch/win32/Makefile.am
branches/marco/ports/vice/src/arch/win32/base.dsp
branches/marco/ports/vice/src/arch/win32/ui.c
branches/marco/ports/vice/src/arch/win32/uikeyboard.c
branches/marco/ports/vice/src/arch/win32/vice.dsw
branches/marco/ports/vice/src/c64/ramcart.c
branches/marco/ports/vice/src/c64/reu.c
branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c
branches/marco/ports/vice/src/lib.c
branches/marco/ports/vice/src/lib.h
branches/marco/ports/vice/src/screenshot.c
branches/marco/ports/vice/src/sound.h
branches/marco/ports/vice/src/version.h
Added Paths:
-----------
branches/marco/ports/vice/src/arch/win32/_vice.dsp
Removed Paths:
-------------
branches/marco/ports/vice/src/arch/win32/_all.dsp
branches/marco/ports/vice/src/arch/win32/vice.dsp
Modified: branches/marco/ports/vice/ChangeLog
===================================================================
--- branches/marco/ports/vice/ChangeLog 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/ChangeLog 2008-07-04 23:48:22 UTC (rev 18962)
@@ -1,3 +1,24 @@
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.23
+
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * Makefile.am: Make sure the file Doxyfile is included in the
+ distribution.
+
+ * doc/html/Makefile.am: Make sure the files hpux.html and
+ sco.html are included in the distribution.
+
+2008-07-01 Marco van den Heuvel <bla...@ya...>
+
+ * doc/GP2X-Howto.txt, doc/Makefile.am: Added a GP2X compile
+ howto text file.
+
+2008-07-02 Andreas Matthies <and...@gm...>
+
+ * doc/html/plain/BUGS, NEWS: Updated.
+
2008-07-01 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.22
Modified: branches/marco/ports/vice/Makefile.am
===================================================================
--- branches/marco/ports/vice/Makefile.am 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/Makefile.am 2008-07-04 23:48:22 UTC (rev 18962)
@@ -2,7 +2,14 @@
SUBDIRS = $(POSUB) src build data man doc
-EXTRA_DIST = AUTHORS FEEDBACK COPYING INSTALL NEWS vice.spec vice-mint.spec
+EXTRA_DIST = AUTHORS \
+ FEEDBACK \
+ COPYING \
+ Doxyfile \
+ INSTALL \
+ NEWS \
+ vice.spec \
+ vice-mint.spec
.PHONY: x64 x128 xvic xpet xplus4 xcbm2
x64:
Modified: branches/marco/ports/vice/configure.in
===================================================================
--- branches/marco/ports/vice/configure.in 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/configure.in 2008-07-04 23:48:22 UTC (rev 18962)
@@ -9,7 +9,7 @@
VICE_VERSION_MAJOR=1
VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=22
+VICE_VERSION_BUILD=23
AC_SUBST(VICE_VERSION_MAJOR)
AC_SUBST(VICE_VERSION_MINOR)
Modified: branches/marco/ports/vice/doc/html/Makefile.am
===================================================================
--- branches/marco/ports/vice/doc/html/Makefile.am 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/doc/html/Makefile.am 2008-07-04 23:48:22 UTC (rev 18962)
@@ -9,6 +9,7 @@
images/new.gif \
images/vice-logo.jpg \
index.html \
+ hpux.html \
macosx.html \
plain/64doc.txt \
plain/BUGS \
@@ -21,6 +22,7 @@
plain/drive_info.txt \
plain/serial.txt \
qnx.html \
+ sco.html \
solaris.html \
vice_1.html \
vice_2.html \
Modified: branches/marco/ports/vice/doc/html/plain/BUGS
===================================================================
--- branches/marco/ports/vice/doc/html/plain/BUGS 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/doc/html/plain/BUGS 2008-07-04 23:48:22 UTC (rev 18962)
@@ -1,3 +1,6 @@
+- IRQ acknowledge handling is buggy. Visible in e.g.
+ Charlatan/Beyond Force, Enforcer, Bandits (VIC20).
+
- Xaw UI context popup menu for drive attach is broken if more than
two drives are active.
Modified: branches/marco/ports/vice/doc/html/plain/NEWS
===================================================================
--- branches/marco/ports/vice/doc/html/plain/NEWS 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/doc/html/plain/NEWS 2008-07-04 23:48:22 UTC (rev 18962)
@@ -41,6 +41,16 @@
- Improved REU compatibility
+- Fixed CPU timing bug introduced in 1.22 (demo "Borderless").
+
+- Fixed bugs in the CIA emulation (demo "So-phisticated",
+ W. Lorenz testsuite).
+
+- Fixed various bugs in VIC-II emulation: Sprite x-positioning,
+ Latch X/Y, video mode changes, DEN bit handling, raster IRQ,
+ NTSC sprites and sprites in full/debugging border mode (list
+ of fixed demos/games too long to mention here).
+
** VIC20 changes
----------------
@@ -87,6 +97,14 @@
- allow for pasting into the VICE window: Either via menu
(Edit/Paste), or by right-clicking on the VICE window.
+- keyboard shortcuts are definable in the configuration file
+ win_shortscuts.vsc
+
+- After a CPU jam user can select to resume emulation without
+ reset.
+
+- Fixed volume slider behaviour when switching fullscreen mode.
+
** BeOS changes
---------------
@@ -120,7 +138,9 @@
- New memmap feature which allows tracking of memory accesses,
activated by the configure option --enable-memmap.
+- Fixed bug in ffmpeg/FFV1 driver. Should be really lossless now.
+
* Changes in VICE 1.22
======================
Modified: branches/marco/ports/vice/src/ChangeLog
===================================================================
--- branches/marco/ports/vice/src/ChangeLog 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/ChangeLog 2008-07-04 23:48:22 UTC (rev 18962)
@@ -1,3 +1,99 @@
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * Version 1.22.23
+
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * arch/win32/Makefile.am: Removed vice.dsp
+
+ * arch/win32/vice.dsw: Removed vice.dsp
+
+ * c64/ramcart.c: Include vicii-phi1.h for vicii_read_phi1().
+
+ * clipboard.c: Define for variable i as unsigned to prevent a
+ warning.
+
+ * arch/win32/base.dsp: Add clipboard.c so vice compiles again.
+
+ * sound.h: changed SWORD sound_audio_mix(SWORD ch1, SWORD ch2);
+ to SWORD sound_audio_mix(int ch1, int ch2).
+
+ * gfxoutputdrv/bmpdrv.c: bmpdrv_write_memmap() now is a void
+ function.
+
+ * screenshot.c: memmap_screenshot_save() had an unused variable
+ i, removed that.
+
+ * lib.c, lib.h: lib_free() now takes a const pointer.
+
+ * arch/unix/archdep.c: viceuserdir is now a const pointer.
+
+ * arch/unix/tfearch.c: Removed unused TfePcapCloseAdapter()
+ function.
+
+2008-07-04 Marco van den Heuvel <bla...@ya...>
+
+ * Makefile.am, arch/win32/ui.c, clipboard.c, clipboard.h: Moved
+ the common clipboard code that Spiro made to the new common
+ files called 'clipboard.c' and 'clipboard.h'.
+
+ * arch/amigaos/c128uires.h, arch/amigaos/c64uires.h,
+ arch/amigaos/cbm2uires.h, arch/amigaos/intl.c,
+ arch/amigaos/intl.txt, arch/amigaos/petuires.h,
+ arch/amigaos/plus4uires.h, arch/amigaos/private.h,
+ arch/amigaos/ui.c, arch/amigaos/uires.h,
+ arch/amigaos/vic20uires.h: Added text-only copy and paste
+ support to the amiga ports.
+
+ * arch/amigaos/joyai.c: Corrected some typos.
+
+ * arch/amigaos/video.c: Fixed a wrongly placed #endif.
+
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * arch/unix/macosx/Makefile.am: Make sure the file
+ VICE.xcodeproj/project.pbxproj is included in the source
+ distribution.
+
+ * arch/unix/macosx/Resources/English.lproj/Makefile.am: Make
+ sure some MacOS files are included in the source distribution.
+
+2008-07-01 Marco van den Heuvel <bla...@ya...>
+
+ * arch/win32/ui.c, c128/c128mem.c, c64/c64mem.c, cbm2/cbm2mem.c,
+ mem.h, monitor/monitor.c, pet/petmem.c, plus4/plus4mem.c,
+ vic20/vic20mem.c: Fixed the returned values of the
+ mem_get_screen_parameter() of some of the emulators, and added a
+ bank parameter to the mem_get_screen_parameter() function, this
+ was needed to get it to work for xcbm2.
+
+ * sound.h: Added a static inline 2-channel digital audio mixing
+ routine.
+
+ * c64/digimax.c, pet/petsound.c, plus4/ted-sound.c,
+ vic20/vic20sound.c: Fixed to use proper digital audio mixing.
+
+2008-07-02 Spiro Trikaliotis <spi...@gm...>
+
+ * arch/win32/Makefile.am: Renamed _all.dsp to _vice.dsp
+
+ * arch/win32/_all.dsp, arch/win32/_vice.dsp: renamed _all.dsp to
+ _vice.dsp.
+
+2008-07-02 Andreas Matthies <and...@gm...>
+
+ * arch/win32/ui.c: Moved creation of accelerators to
+ ui_init_finish.
+
+ * arch/win32/uikeyboard.c: Log a warning if the shortcut file
+ cannot be opened.
+
+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: branches/marco/ports/vice/src/arch/unix/archdep.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/archdep.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/unix/archdep.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -260,7 +260,7 @@
{
char *fname;
const char *home;
- char *viceuserdir;
+ const char *viceuserdir;
if(archdep_pref_path==NULL) {
home = archdep_home_path();
Modified: branches/marco/ports/vice/src/arch/unix/macosx/Makefile.am
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Makefile.am 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Makefile.am 2008-07-04 23:48:22 UTC (rev 18962)
@@ -27,4 +27,5 @@
Info.plist \
make-bindist.sh \
x11-launcher.sh \
- vice-launcher.sh
+ vice-launcher.sh \
+ VICE.xcodeproj/project.pbxproj
Modified: branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am
===================================================================
--- branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am 2008-07-04 23:48:22 UTC (rev 18962)
@@ -16,10 +16,16 @@
PrinterSettings.nib/keyedobjects.nib \
KeyboardSettings.nib/classes.nib \
KeyboardSettings.nib/info.nib \
- KeyboardSettings.nib/keyedobjects.nib
+ KeyboardSettings.nib/keyedobjects.nib \
JoystickSettings.nib/classes.nib \
JoystickSettings.nib/info.nib \
JoystickSettings.nib/keyedobjects.nib \
+ RecordMedia.nib/classes.nib \
+ RecordMedia.nib/info.nib \
ResourceEditor.nib/classes.nib \
ResourceEditor.nib/info.nib \
- ResourceEditor.nib/keyedobjects.nib
+ ResourceEditor.nib/keyedobjects.nib \
+ ResourceTree.plist \
+ SoundSettings.nib/classes.nib \
+ SoundSettings.nib/info.nib \
+ SoundSettings.nib/keyedobjects.nib
Modified: branches/marco/ports/vice/src/arch/unix/tfearch.c
===================================================================
--- branches/marco/ports/vice/src/arch/unix/tfearch.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/unix/tfearch.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -96,6 +96,7 @@
#endif // #ifdef TFE_DEBUG_PKTDUMP
+#if 0
static
void TfePcapCloseAdapter(void)
{
@@ -109,6 +110,7 @@
TfePcapFP = NULL;
}
}
+#endif
/*
These functions let the UI enumerate the available interfaces.
Modified: branches/marco/ports/vice/src/arch/win32/Makefile.am
===================================================================
--- branches/marco/ports/vice/src/arch/win32/Makefile.am 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/Makefile.am 2008-07-04 23:48:22 UTC (rev 18962)
@@ -307,6 +307,7 @@
watcom/xplus4main.c \
watcom/xvic.tgt \
watcom/xvicmain.c \
+ _vice.dsp \
arch.dsp \
base.dsp \
c128.dsp \
@@ -358,7 +359,6 @@
vdc.dsp \
vdrive.dsp \
vic20.dsp \
- vice.dsp \
vicii.dsp \
video.dsp \
x128.dsp \
Deleted: branches/marco/ports/vice/src/arch/win32/_all.dsp
===================================================================
--- branches/marco/ports/vice/src/arch/win32/_all.dsp 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/_all.dsp 2008-07-04 23:48:22 UTC (rev 18962)
@@ -1,89 +0,0 @@
-# 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
Copied: branches/marco/ports/vice/src/arch/win32/_vice.dsp (from rev 18961, tags/v1.22/v1.22.23/vice/src/arch/win32/_vice.dsp)
===================================================================
--- branches/marco/ports/vice/src/arch/win32/_vice.dsp (rev 0)
+++ branches/marco/ports/vice/src/arch/win32/_vice.dsp 2008-07-04 23:48:22 UTC (rev 18962)
@@ -0,0 +1,89 @@
+# Microsoft Developer Studio Project File - Name="_vice" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=_vice - 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 "_vice.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 "_vice.mak" CFG="_vice - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "_vice - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "_vice - 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)" == "_vice - 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)" == "_vice - 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 "_vice - Win32 Release"
+# Name "_vice - Win32 Debug"
+# End Target
+# End Project
Modified: branches/marco/ports/vice/src/arch/win32/base.dsp
===================================================================
--- branches/marco/ports/vice/src/arch/win32/base.dsp 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/base.dsp 2008-07-04 23:48:22 UTC (rev 18962)
@@ -140,6 +140,10 @@
# End Source File
# Begin Source File
+SOURCE="..\..\clipboard.c"
+# End Source File
+# Begin Source File
+
SOURCE="..\..\clkguard.c"
# End Source File
# Begin Source File
Modified: branches/marco/ports/vice/src/arch/win32/ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/win32/ui.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/ui.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -258,8 +258,6 @@
emu_menu = IDR_MENUC64;
}
- ui_accelerator = uikeyboard_create_accelerator_table();
-
/* Register the window class. */
window_class.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
window_class.lpfnWndProc = window_proc;
@@ -325,6 +323,7 @@
/* Initialize the UI after setting all the resource values. */
int ui_init_finish(void)
{
+ ui_accelerator = uikeyboard_create_accelerator_table();
ui_fullscreen_init();
atexit(ui_exit);
return 0;
Modified: branches/marco/ports/vice/src/arch/win32/uikeyboard.c
===================================================================
--- branches/marco/ports/vice/src/arch/win32/uikeyboard.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/uikeyboard.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -48,6 +48,7 @@
#include "intl.h"
#include "keyboard.h"
#include "lib.h"
+#include "log.h"
#include "res.h"
#include "resources.h"
#include "sysfile.h"
@@ -265,8 +266,10 @@
fshortcuts = sysfile_open("win_shortcuts.vsc", &complete_path, MODE_READ_TEXT);
lib_free(complete_path);
- if (fshortcuts == NULL)
+ if (fshortcuts == NULL) {
+ log_error(LOG_DEFAULT, "Warning. Cannot open keyboard shortcut file win_shortcuts.vsc.");
return NULL;
+ }
/* read the shortcut table */
do {
@@ -336,35 +339,6 @@
}
-#if 0
-void uikeyboard_menu_shortcuts(HMENU menu)
-{
- int i;
- MENUITEMINFO mii;
- LPTSTR buf, newbuf;
-
- for (i = 0; idmlist[i].cmd > 0; i++) {
- if (menuitemmodifier[idmlist[i].cmd] != NULL) {
- mii.fMask = MIIM_STRING;
- mii.dwTypeData = NULL;
- mii.cbSize = sizeof(MENUITEMINFO);
- if (GetMenuItemInfo(menu, idmlist[i].cmd, FALSE, &mii)) {
- mii.cch++;
- buf = lib_malloc(mii.cch);
- mii.dwTypeData = buf;
- if (GetMenuItemInfo(menu, idmlist[i].cmd, FALSE, &mii)) {
- newbuf = util_concat(buf, menuitemmodifier[idmlist[i].cmd], NULL);
- mii.dwTypeData = newbuf;
- SetMenuItemInfo(menu, idmlist[i].cmd, FALSE, &mii);
- lib_free(newbuf);
- }
- lib_free(buf);
- }
- }
- }
-}
-#endif
-
/* using MIIM_STRING doesn't work for win9x/winnt4, so trying an older way */
void uikeyboard_menu_shortcuts(HMENU menu)
{
Deleted: branches/marco/ports/vice/src/arch/win32/vice.dsp
===================================================================
--- branches/marco/ports/vice/src/arch/win32/vice.dsp 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/vice.dsp 2008-07-04 23:48:22 UTC (rev 18962)
@@ -1,89 +0,0 @@
-# Microsoft Developer Studio Project File - Name="vice" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=vice - 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 "vice.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 "vice.mak" CFG="vice - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "vice - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "vice - 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)" == "vice - 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)" == "vice - 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 "vice - Win32 Release"
-# Name "vice - Win32 Debug"
-# End Target
-# End Project
Modified: branches/marco/ports/vice/src/arch/win32/vice.dsw
===================================================================
--- branches/marco/ports/vice/src/arch/win32/vice.dsw 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/arch/win32/vice.dsw 2008-07-04 23:48:22 UTC (rev 18962)
@@ -3,7 +3,7 @@
###############################################################################
-Project: "_all"=".\_all.dsp" - Package Owner=<4>
+Project: "_vice"=".\_vice.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -712,47 +712,8 @@
End Project Dependency
}}}
-###############################################################################
+##############################################################################
-Project: "vice"=".\vice.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: "vicii"=".\vicii.dsp" - Package Owner=<4>
Package=<5>
Modified: branches/marco/ports/vice/src/c64/ramcart.c
===================================================================
--- branches/marco/ports/vice/src/c64/ramcart.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/c64/ramcart.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -96,8 +96,8 @@
#endif
#include "types.h"
#include "util.h"
+#include "vicii-phi1.h"
-
static const c64export_resource_t export_res = {
"RAMCART", 1, 0
};
Modified: branches/marco/ports/vice/src/c64/reu.c
===================================================================
--- branches/marco/ports/vice/src/c64/reu.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/c64/reu.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -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.") );
Modified: branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c
===================================================================
--- branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/gfxoutputdrv/bmpdrv.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -472,7 +472,7 @@
return 0;
}
-static int bmpdrv_write_memmap(int line, int x_size, int y_size, BYTE *gfx)
+static void bmpdrv_write_memmap(int line, int x_size, int y_size, BYTE *gfx)
{
memcpy(bmpdrv_memmap_bmp_data + (y_size - 1 - line) * x_size, gfx+(line*x_size), x_size);
}
Modified: branches/marco/ports/vice/src/lib.c
===================================================================
--- branches/marco/ports/vice/src/lib.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/lib.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -490,8 +490,9 @@
return new_ptr;
}
-void lib_free(void *ptr)
+void lib_free(const void *constptr)
{
+ void * ptr = (void*) constptr;
#ifdef LIB_DEBUG
lib_debug_free(ptr, 1, 1);
#endif
Modified: branches/marco/ports/vice/src/lib.h
===================================================================
--- branches/marco/ports/vice/src/lib.h 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/lib.h 2008-07-04 23:48:22 UTC (rev 18962)
@@ -38,7 +38,7 @@
extern void *lib_malloc(size_t size);
extern void *lib_calloc(size_t nmemb, size_t size);
extern void *lib_realloc(void *p, size_t size);
-extern void lib_free(void *ptr);
+extern void lib_free(const void *ptr);
extern char *lib_stralloc(const char *str);
extern char *lib_msprintf(const char *fmt, ...);
Modified: branches/marco/ports/vice/src/screenshot.c
===================================================================
--- branches/marco/ports/vice/src/screenshot.c 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/screenshot.c 2008-07-04 23:48:22 UTC (rev 18962)
@@ -194,7 +194,6 @@
int memmap_screenshot_save(const char *drvname, const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
{
gfxoutputdrv_t *drv;
- unsigned int i;
if ((drv = gfxoutput_get_driver(drvname)) == NULL)
return -1;
Modified: branches/marco/ports/vice/src/sound.h
===================================================================
--- branches/marco/ports/vice/src/sound.h 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/sound.h 2008-07-04 23:48:22 UTC (rev 18962)
@@ -85,7 +85,7 @@
int need_attenuation;
} sound_device_t;
-static inline SWORD sound_audio_mix(SWORD ch1, SWORD ch2)
+static inline SWORD sound_audio_mix(int ch1, int ch2)
{
if (ch1 == 0)
return ch2;
Modified: branches/marco/ports/vice/src/version.h
===================================================================
--- branches/marco/ports/vice/src/version.h 2008-07-04 23:09:30 UTC (rev 18961)
+++ branches/marco/ports/vice/src/version.h 2008-07-04 23:48:22 UTC (rev 18962)
@@ -28,11 +28,11 @@
#define __VERSION_H__
#ifndef VERSION
-#define VERSION "1.22.22"
+#define VERSION "1.22.23"
#endif
#ifndef VERSION_RC_NUMBER
-#define VERSION_RC_NUMBER 1,22,22,0
+#define VERSION_RC_NUMBER 1,22,23,0
#endif
#ifndef PACKAGE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-04 23:09:20
|
Revision: 18961
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18961&view=rev
Author: blackystardust
Date: 2008-07-04 16:09:30 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Added copy/paste support to the BeOS port.
Modified Paths:
--------------
branches/marco/ports/vice/src/arch/beos/Makefile.am
branches/marco/ports/vice/src/arch/beos/console.c
branches/marco/ports/vice/src/arch/beos/constants.h
branches/marco/ports/vice/src/arch/beos/ui.cc
branches/marco/ports/vice/src/arch/beos/ui_sid.cc
branches/marco/ports/vice/src/arch/beos/vicemenu.cc
branches/marco/ports/vice/src/clipboard.h
Modified: branches/marco/ports/vice/src/arch/beos/Makefile.am
===================================================================
--- branches/marco/ports/vice/src/arch/beos/Makefile.am 2008-07-04 19:16:46 UTC (rev 18960)
+++ branches/marco/ports/vice/src/arch/beos/Makefile.am 2008-07-04 23:09:30 UTC (rev 18961)
@@ -8,6 +8,7 @@
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/drive \
-I$(top_srcdir)/src/vdrive \
+ -I$(top_srcdir)/src/monitor \
-I$(top_srcdir)/src/c64 \
-I$(top_srcdir)/src/c128 \
-I$(top_srcdir)/src/vic20 \
Modified: branches/marco/ports/vice/src/arch/beos/console.c
===================================================================
--- branches/marco/ports/vice/src/arch/beos/console.c 2008-07-04 19:16:46 UTC (rev 18960)
+++ branches/marco/ports/vice/src/arch/beos/console.c 2008-07-04 23:09:30 UTC (rev 18961)
@@ -53,7 +53,7 @@
#else
char *readline(const char *prompt)
{
- char *p, *v;
+ char *p, *rv;
console_out(NULL, "%s", prompt);
fflush(stdout);
Modified: branches/marco/ports/vice/src/arch/beos/constants.h
===================================================================
--- branches/marco/ports/vice/src/arch/beos/constants.h 2008-07-04 19:16:46 UTC (rev 18960)
+++ branches/marco/ports/vice/src/arch/beos/constants.h 2008-07-04 23:09:30 UTC (rev 18961)
@@ -111,6 +111,9 @@
const uint32 ATTACH_C64_CART = 'MA01';
const uint32 ATTACH_VIC20_CART = 'MA02';
+const uint32 MENU_COPY = 'M161';
+const uint32 MENU_PASTE = 'M162';
+
const uint32 MENU_TOGGLE_SOUND = 'M100';
const uint32 MENU_TOGGLE_WARP_MODE = 'M101';
const uint32 MENU_TOGGLE_DRIVE_TRUE_EMULATION = 'M102';
Modified: branches/marco/ports/vice/src/arch/beos/ui.cc
===================================================================
--- branches/marco/ports/vice/src/arch/beos/ui.cc 2008-07-04 19:16:46 UTC (rev 18960)
+++ branches/marco/ports/vice/src/arch/beos/ui.cc 2008-07-04 23:09:30 UTC (rev 18961)
@@ -28,6 +28,7 @@
#include <Alert.h>
#include <Application.h>
+#include <Clipboard.h>
#include <FilePanel.h>
#include <Menu.h>
#include <MenuBar.h>
@@ -46,7 +47,9 @@
#include "attach.h"
#include "autostart.h"
#include "archdep.h"
+#include "charset.h"
#include "cmdline.h"
+#include "clipboard.h"
#include "constants.h"
#include "datasette.h"
#include "drive.h"
@@ -57,6 +60,7 @@
#include "interrupt.h"
#include "joy.h"
#include "kbd.h"
+#include "kbdbuf.h"
#include "keyboard.h"
#include "lib.h"
#include "log.h"
@@ -426,7 +430,56 @@
return is_paused;
}
+static void ui_copy_clipboard(void)
+{
+ BMessage *clippy = (BMessage *)NULL;
+ char *text = NULL;
+ text = clipboard_read_screen_output("\n");
+
+ if (text != NULL)
+ {
+ if (be_clipboard->Lock())
+ {
+ be_clipboard->Clear();
+ if (clippy = be_clipboard->Data())
+ {
+ clippy->AddData("text/plain", B_MIME_TYPE, text, strlen(text));
+ be_clipboard->Commit();
+ }
+ be_clipboard->Unlock();
+ }
+ lib_free(text);
+ }
+}
+
+static void ui_paste_clipboard_text(void)
+{
+ const char *text;
+ char *text_in_petscii = NULL;
+ int32 textlen = 0;
+ BMessage *clippy = (BMessage *)NULL;
+
+ if (be_clipboard->Lock())
+ {
+ if (clippy = be_clipboard->Data())
+ {
+ clippy->FindData("text/plain", B_MIME_TYPE, (const void **)&text, &textlen);
+
+ if (textlen != 0)
+ {
+ text_in_petscii = (char *)lib_malloc(textlen + 1);
+ memcpy(text_in_petscii, text, textlen);
+ text_in_petscii[textlen] = 0;
+ charset_petconvstring((unsigned char *)text_in_petscii, 0);
+ kbdbuf_feed(text_in_petscii);
+ lib_free(text_in_petscii);
+ }
+ }
+ be_clipboard->Unlock();
+ }
+}
+
/* here the stuff for queueing and dispatching ui commands */
/*---------------------------------------------------------*/
#define MAX_MESSAGE_QUEUE_SIZE 256
@@ -638,6 +691,12 @@
case MENU_PAUSE:
ui_pause_emulation();
break;
+ case MENU_COPY:
+ ui_copy_clipboard();
+ break;
+ case MENU_PASTE:
+ ui_paste_clipboard_text();
+ break;
case MENU_SOUND_RECORD_AIFF:
ui_select_file(windowlist[0]->savepanel,AIFF_FILE,(void*)0);
resources_set_string("SoundRecordDeviceName", "");
Modified: branches/marco/ports/vice/src/arch/beos/ui_sid.cc
===================================================================
--- branches/marco/ports/vice/src/arch/beos/ui_sid.cc 2008-07-04 19:16:46 UTC (rev 18960)
+++ branches/marco/ports/vice/src/arch/beos/ui_sid.cc 2008-07-04 23:09:30 UTC (rev 18961)
@@ -88,12 +88,13 @@
void CreateAndGetAddressList(BListView *addresslistview, int mode)
{
- /* mode: 0=Create 1=get */
+ /* mode: 0=Create 1=get */
char st[12];
int res_value;
int adr, ladr, hi, index = -1;
int *hadr;
- int cursel = addresslistview->CurrentSelection();
+ int cursel = addresslistview->CurrentSelection();
+ BListItem *item;
resources_get_int("SidStereoAddressStart", &res_value);
Modified: branches/marco/ports/vice/src/arch/beos/vicemenu.cc
===================================================================
--- branches/marco/ports/vice/src/arch/beos/vicemenu.cc 2008-07-04 19:16:46 UTC (rev 18960)
+++ branches/marco/ports/vice/src/arch/beos/vicemenu.cc 2008-07-04 23:09:30 UTC (rev 18961)
@@ -256,6 +256,16 @@
menu->AddItem(new BMenuItem("Quit",
new BMessage(MENU_EXIT_REQUESTED), 'Q'));
+ /* create the EDIT menu */
+ menu = new BMenu("Edit");
+ menubar->AddItem(menu);
+ if (!vsid_mode) {
+ menu->AddItem(new BMenuItem("Copy",
+ new BMessage(MENU_COPY)));
+ menu->AddItem(new BMenuItem("Paste",
+ new BMessage(MENU_PASTE)));
+ }
+
/* create the OPTIONS menu */
menu = new BMenu("Options");
menubar->AddItem(menu);
Modified: branches/marco/ports/vice/src/clipboard.h
===================================================================
--- branches/marco/ports/vice/src/clipboard.h 2008-07-04 19:16:46 UTC (rev 18960)
+++ branches/marco/ports/vice/src/clipboard.h 2008-07-04 23:09:30 UTC (rev 18961)
@@ -1,35 +1,35 @@
-/*
- * clipboard.c - Common clipboard related functions.
- *
- * Written by
- * Spiro Trikaliotis <Spi...@gm...>
- * Marco van den Heuvel <bla...@ya...>
- *
- * This file is part of VICE, the Versatile Commodore Emulator.
- * See README for copyright notice.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.
- *
- */
-
-#ifndef _CLIPBOARD_H
-#define _CLIPBOARD_H
-
-#include "vice.h"
-
-extern char *clipboard_read_screen_output(char *line_ending);
-
-#endif
+/*
+ * clipboard.c - Common clipboard related functions.
+ *
+ * Written by
+ * Spiro Trikaliotis <Spi...@gm...>
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#ifndef _VICE_CLIPBOARD_H
+#define _VICE_CLIPBOARD_H
+
+#include "vice.h"
+
+extern char *clipboard_read_screen_output(char *line_ending);
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-04 19:16:38
|
Revision: 18960
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18960&view=rev
Author: strik
Date: 2008-07-04 12:16:46 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Tagged version 1.22.23.
Added Paths:
-----------
tags/v1.22/v1.22.23/
Copied: tags/v1.22/v1.22.23 (from rev 18959, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-04 19:16:27
|
Revision: 18959
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18959&view=rev
Author: strik
Date: 2008-07-04 12:16:34 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
2008-07-04 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.23
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-04 18:58:23 UTC (rev 18958)
+++ trunk/vice/ChangeLog 2008-07-04 19:16:34 UTC (rev 18959)
@@ -1,5 +1,9 @@
2008-07-04 Spiro Trikaliotis <spi...@gm...>
+ * Version 1.22.23
+
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
* Makefile.am: Make sure the file Doxyfile is included in the
distribution.
Modified: trunk/vice/configure.in
===================================================================
--- trunk/vice/configure.in 2008-07-04 18:58:23 UTC (rev 18958)
+++ trunk/vice/configure.in 2008-07-04 19:16:34 UTC (rev 18959)
@@ -9,7 +9,7 @@
VICE_VERSION_MAJOR=1
VICE_VERSION_MINOR=22
-VICE_VERSION_BUILD=22
+VICE_VERSION_BUILD=23
AC_SUBST(VICE_VERSION_MAJOR)
AC_SUBST(VICE_VERSION_MINOR)
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-07-04 18:58:23 UTC (rev 18958)
+++ trunk/vice/src/ChangeLog 2008-07-04 19:16:34 UTC (rev 18959)
@@ -1,5 +1,9 @@
2008-07-04 Spiro Trikaliotis <spi...@gm...>
+ * Version 1.22.23
+
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
* arch/win32/Makefile.am: Removed vice.dsp
* arch/win32/vice.dsw: Removed vice.dsp
Modified: trunk/vice/src/version.h
===================================================================
--- trunk/vice/src/version.h 2008-07-04 18:58:23 UTC (rev 18958)
+++ trunk/vice/src/version.h 2008-07-04 19:16:34 UTC (rev 18959)
@@ -28,11 +28,11 @@
#define __VERSION_H__
#ifndef VERSION
-#define VERSION "1.22.22"
+#define VERSION "1.22.23"
#endif
#ifndef VERSION_RC_NUMBER
-#define VERSION_RC_NUMBER 1,22,22,0
+#define VERSION_RC_NUMBER 1,22,23,0
#endif
#ifndef PACKAGE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-04 19:00:38
|
Revision: 18957
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18957&view=rev
Author: strik
Date: 2008-07-04 10:55:57 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
2008-07-04 Spiro Trikaliotis <spi...@gm...>
* src/c64/ramcart.c: Include vicii-phi1.h for vicii_read_phi1().
* src/clipboard.c: Define for variable i as unsigned to prevent
a warning.
* src/arch/win32/base.dsp: Add clipboard.c so vice compiles
again.
* src/sound.h: changed SWORD sound_audio_mix(SWORD ch1, SWORD
ch2); to SWORD sound_audio_mix(int ch1, int ch2).
Modified Paths:
--------------
trunk/vice/src/ChangeLog
trunk/vice/src/arch/win32/base.dsp
trunk/vice/src/c64/ramcart.c
trunk/vice/src/clipboard.c
trunk/vice/src/sound.h
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-07-04 17:22:07 UTC (rev 18956)
+++ trunk/vice/src/ChangeLog 2008-07-04 17:55:57 UTC (rev 18957)
@@ -4,6 +4,16 @@
* arch/win32/vice.dsw: Removed vice.dsp
+ * c64/ramcart.c: Include vicii-phi1.h for vicii_read_phi1().
+
+ * clipboard.c: Define for variable i as unsigned to prevent a
+ warning.
+
+ * arch/win32/base.dsp: Add clipboard.c so vice compiles again.
+
+ * sound.h: changed SWORD sound_audio_mix(SWORD ch1, SWORD ch2);
+ to SWORD sound_audio_mix(int ch1, int ch2).
+
2008-07-04 Marco van den Heuvel <bla...@ya...>
* Makefile.am, arch/win32/ui.c, clipboard.c, clipboard.h: Moved
Modified: trunk/vice/src/arch/win32/base.dsp
===================================================================
--- trunk/vice/src/arch/win32/base.dsp 2008-07-04 17:22:07 UTC (rev 18956)
+++ trunk/vice/src/arch/win32/base.dsp 2008-07-04 17:55:57 UTC (rev 18957)
@@ -140,6 +140,10 @@
# End Source File
# Begin Source File
+SOURCE="..\..\clipboard.c"
+# End Source File
+# Begin Source File
+
SOURCE="..\..\clkguard.c"
# End Source File
# Begin Source File
Modified: trunk/vice/src/c64/ramcart.c
===================================================================
--- trunk/vice/src/c64/ramcart.c 2008-07-04 17:22:07 UTC (rev 18956)
+++ trunk/vice/src/c64/ramcart.c 2008-07-04 17:55:57 UTC (rev 18957)
@@ -96,8 +96,8 @@
#endif
#include "types.h"
#include "util.h"
+#include "vicii-phi1.h"
-
static const c64export_resource_t export_res = {
"RAMCART", 1, 0
};
Modified: trunk/vice/src/clipboard.c
===================================================================
--- trunk/vice/src/clipboard.c 2008-07-04 17:22:07 UTC (rev 18956)
+++ trunk/vice/src/clipboard.c 2008-07-04 17:55:57 UTC (rev 18957)
@@ -45,8 +45,8 @@
unsigned int row, col;
unsigned int size;
unsigned int line_ending_length = strlen(line_ending);
+ unsigned int i;
int bank;
- int i;
char * p;
mem_get_screen_parameter(&base, &allrows, &allcols, &bank);
Modified: trunk/vice/src/sound.h
===================================================================
--- trunk/vice/src/sound.h 2008-07-04 17:22:07 UTC (rev 18956)
+++ trunk/vice/src/sound.h 2008-07-04 17:55:57 UTC (rev 18957)
@@ -85,7 +85,7 @@
int need_attenuation;
} sound_device_t;
-static inline SWORD sound_audio_mix(SWORD ch1, SWORD ch2)
+static inline SWORD sound_audio_mix(int ch1, int ch2)
{
if (ch1 == 0)
return ch2;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-04 18:58:14
|
Revision: 18958
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18958&view=rev
Author: strik
Date: 2008-07-04 11:58:23 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
2008-07-04 Spiro Trikaliotis <spi...@gm...>
* arch/win32/Makefile.am: Removed vice.dsp
* arch/win32/vice.dsw: Removed vice.dsp
* c64/ramcart.c: Include vicii-phi1.h for vicii_read_phi1().
* clipboard.c: Define for variable i as unsigned to prevent a
warning.
* arch/win32/base.dsp: Add clipboard.c so vice compiles again.
* sound.h: changed SWORD sound_audio_mix(SWORD ch1, SWORD ch2);
to SWORD sound_audio_mix(int ch1, int ch2).
* src/gfxoutputdrv/bmpdrv.c: bmpdrv_write_memmap() now is a void
function.
* src/screenshot.c: memmap_screenshot_save() had an unused
variable i, removed that.
* src/lib.c, src/lib.h: lib_free() now takes a const pointer.
* src/arch/unix/archdep.c: viceuserdir is now a const pointer.
* src/arch/unix/tfearch.c: Removed unused TfePcapCloseAdapter()
function.
Modified Paths:
--------------
trunk/vice/src/ChangeLog
trunk/vice/src/arch/unix/archdep.c
trunk/vice/src/arch/unix/tfearch.c
trunk/vice/src/gfxoutputdrv/bmpdrv.c
trunk/vice/src/lib.c
trunk/vice/src/lib.h
trunk/vice/src/screenshot.c
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/ChangeLog 2008-07-04 18:58:23 UTC (rev 18958)
@@ -14,6 +14,19 @@
* sound.h: changed SWORD sound_audio_mix(SWORD ch1, SWORD ch2);
to SWORD sound_audio_mix(int ch1, int ch2).
+ * gfxoutputdrv/bmpdrv.c: bmpdrv_write_memmap() now is a void
+ function.
+
+ * screenshot.c: memmap_screenshot_save() had an unused variable
+ i, removed that.
+
+ * lib.c, lib.h: lib_free() now takes a const pointer.
+
+ * arch/unix/archdep.c: viceuserdir is now a const pointer.
+
+ * arch/unix/tfearch.c: Removed unused TfePcapCloseAdapter()
+ function.
+
2008-07-04 Marco van den Heuvel <bla...@ya...>
* Makefile.am, arch/win32/ui.c, clipboard.c, clipboard.h: Moved
Modified: trunk/vice/src/arch/unix/archdep.c
===================================================================
--- trunk/vice/src/arch/unix/archdep.c 2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/arch/unix/archdep.c 2008-07-04 18:58:23 UTC (rev 18958)
@@ -260,7 +260,7 @@
{
char *fname;
const char *home;
- char *viceuserdir;
+ const char *viceuserdir;
if(archdep_pref_path==NULL) {
home = archdep_home_path();
Modified: trunk/vice/src/arch/unix/tfearch.c
===================================================================
--- trunk/vice/src/arch/unix/tfearch.c 2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/arch/unix/tfearch.c 2008-07-04 18:58:23 UTC (rev 18958)
@@ -96,6 +96,7 @@
#endif // #ifdef TFE_DEBUG_PKTDUMP
+#if 0
static
void TfePcapCloseAdapter(void)
{
@@ -109,6 +110,7 @@
TfePcapFP = NULL;
}
}
+#endif
/*
These functions let the UI enumerate the available interfaces.
Modified: trunk/vice/src/gfxoutputdrv/bmpdrv.c
===================================================================
--- trunk/vice/src/gfxoutputdrv/bmpdrv.c 2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/gfxoutputdrv/bmpdrv.c 2008-07-04 18:58:23 UTC (rev 18958)
@@ -472,7 +472,7 @@
return 0;
}
-static int bmpdrv_write_memmap(int line, int x_size, int y_size, BYTE *gfx)
+static void bmpdrv_write_memmap(int line, int x_size, int y_size, BYTE *gfx)
{
memcpy(bmpdrv_memmap_bmp_data + (y_size - 1 - line) * x_size, gfx+(line*x_size), x_size);
}
Modified: trunk/vice/src/lib.c
===================================================================
--- trunk/vice/src/lib.c 2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/lib.c 2008-07-04 18:58:23 UTC (rev 18958)
@@ -490,8 +490,9 @@
return new_ptr;
}
-void lib_free(void *ptr)
+void lib_free(const void *constptr)
{
+ void * ptr = (void*) constptr;
#ifdef LIB_DEBUG
lib_debug_free(ptr, 1, 1);
#endif
Modified: trunk/vice/src/lib.h
===================================================================
--- trunk/vice/src/lib.h 2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/lib.h 2008-07-04 18:58:23 UTC (rev 18958)
@@ -38,7 +38,7 @@
extern void *lib_malloc(size_t size);
extern void *lib_calloc(size_t nmemb, size_t size);
extern void *lib_realloc(void *p, size_t size);
-extern void lib_free(void *ptr);
+extern void lib_free(const void *ptr);
extern char *lib_stralloc(const char *str);
extern char *lib_msprintf(const char *fmt, ...);
Modified: trunk/vice/src/screenshot.c
===================================================================
--- trunk/vice/src/screenshot.c 2008-07-04 17:55:57 UTC (rev 18957)
+++ trunk/vice/src/screenshot.c 2008-07-04 18:58:23 UTC (rev 18958)
@@ -194,7 +194,6 @@
int memmap_screenshot_save(const char *drvname, const char *filename, int x_size, int y_size, BYTE *gfx, BYTE *palette)
{
gfxoutputdrv_t *drv;
- unsigned int i;
if ((drv = gfxoutput_get_driver(drvname)) == NULL)
return -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-04 17:22:02
|
Revision: 18956
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18956&view=rev
Author: strik
Date: 2008-07-04 10:22:07 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
2008-07-04 Spiro Trikaliotis <spi...@gm...>
* src/arch/win32/Makefile.am: Removed vice.dsp
* src/arch/win32/vice.dsw: Removed vice.dsp
* src/arch/win32/_vice.dsp: To preserve history, removed (old)
_vice.dsp and replaced it with a _vice.dsp which has been moved
from vice.dsp.
Modified Paths:
--------------
trunk/vice/src/ChangeLog
trunk/vice/src/arch/win32/Makefile.am
trunk/vice/src/arch/win32/vice.dsw
Added Paths:
-----------
trunk/vice/src/arch/win32/_vice.dsp
Removed Paths:
-------------
trunk/vice/src/arch/win32/_vice.dsp
trunk/vice/src/arch/win32/vice.dsp
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-07-04 17:02:11 UTC (rev 18955)
+++ trunk/vice/src/ChangeLog 2008-07-04 17:22:07 UTC (rev 18956)
@@ -1,3 +1,9 @@
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * arch/win32/Makefile.am: Removed vice.dsp
+
+ * arch/win32/vice.dsw: Removed vice.dsp
+
2008-07-04 Marco van den Heuvel <bla...@ya...>
* Makefile.am, arch/win32/ui.c, clipboard.c, clipboard.h: Moved
Modified: trunk/vice/src/arch/win32/Makefile.am
===================================================================
--- trunk/vice/src/arch/win32/Makefile.am 2008-07-04 17:02:11 UTC (rev 18955)
+++ trunk/vice/src/arch/win32/Makefile.am 2008-07-04 17:22:07 UTC (rev 18956)
@@ -359,7 +359,6 @@
vdc.dsp \
vdrive.dsp \
vic20.dsp \
- vice.dsp \
vicii.dsp \
video.dsp \
x128.dsp \
Deleted: trunk/vice/src/arch/win32/_vice.dsp
===================================================================
--- trunk/vice/src/arch/win32/_vice.dsp 2008-07-04 17:02:11 UTC (rev 18955)
+++ trunk/vice/src/arch/win32/_vice.dsp 2008-07-04 17:22:07 UTC (rev 18956)
@@ -1,89 +0,0 @@
-# Microsoft Developer Studio Project File - Name="_vice" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=_vice - 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 "_vice.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 "_vice.mak" CFG="_vice - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "_vice - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "_vice - 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)" == "_vice - 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)" == "_vice - 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 "_vice - Win32 Release"
-# Name "_vice - Win32 Debug"
-# End Target
-# End Project
Copied: trunk/vice/src/arch/win32/_vice.dsp (from rev 18954, trunk/vice/src/arch/win32/vice.dsp)
===================================================================
--- trunk/vice/src/arch/win32/_vice.dsp (rev 0)
+++ trunk/vice/src/arch/win32/_vice.dsp 2008-07-04 17:22:07 UTC (rev 18956)
@@ -0,0 +1,89 @@
+# Microsoft Developer Studio Project File - Name="_vice" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=_vice - 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 "_vice.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 "_vice.mak" CFG="_vice - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "_vice - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "_vice - 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)" == "_vice - 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)" == "_vice - 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 "_vice - Win32 Release"
+# Name "_vice - Win32 Debug"
+# End Target
+# End Project
Deleted: trunk/vice/src/arch/win32/vice.dsp
===================================================================
--- trunk/vice/src/arch/win32/vice.dsp 2008-07-04 17:02:11 UTC (rev 18955)
+++ trunk/vice/src/arch/win32/vice.dsp 2008-07-04 17:22:07 UTC (rev 18956)
@@ -1,89 +0,0 @@
-# Microsoft Developer Studio Project File - Name="vice" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=vice - 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 "vice.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 "vice.mak" CFG="vice - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "vice - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "vice - 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)" == "vice - 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)" == "vice - 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 "vice - Win32 Release"
-# Name "vice - Win32 Debug"
-# End Target
-# End Project
Modified: trunk/vice/src/arch/win32/vice.dsw
===================================================================
--- trunk/vice/src/arch/win32/vice.dsw 2008-07-04 17:02:11 UTC (rev 18955)
+++ trunk/vice/src/arch/win32/vice.dsw 2008-07-04 17:22:07 UTC (rev 18956)
@@ -3,7 +3,7 @@
###############################################################################
-Project: "_all"=".\_all.dsp" - Package Owner=<4>
+Project: "_vice"=".\_vice.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -712,47 +712,8 @@
End Project Dependency
}}}
-###############################################################################
+##############################################################################
-Project: "vice"=".\vice.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: "vicii"=".\vicii.dsp" - Package Owner=<4>
Package=<5>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-04 17:02:15
|
Revision: 18955
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18955&view=rev
Author: strik
Date: 2008-07-04 10:02:11 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
2008-07-04 Marco van den Heuvel <bla...@ya...>
* src/Makefile.am, src/arch/win32/ui.c, src/clipboard.c,
src/clipboard.h: Moved the common clipboard code that Spiro made
to the new common files called 'clipboard.c' and 'clipboard.h'.
* src/arch/amigaos/c128uires.h, src/arch/amigaos/c64uires.h,
src/arch/amigaos/cbm2uires.h, src/arch/amigaos/intl.c,
src/arch/amigaos/intl.txt, src/arch/amigaos/petuires.h,
src/arch/amigaos/plus4uires.h, src/arch/amigaos/private.h,
src/arch/amigaos/ui.c, src/arch/amigaos/uires.h,
src/arch/amigaos/vic20uires.h: Added text-only copy and paste
support to the amiga ports.
* src/arch/amigaos/joyai.c: Corrected some typos.
* src/arch/amigaos/video.c: Fixed a wrongly placed #endif.
Modified Paths:
--------------
trunk/vice/src/ChangeLog
trunk/vice/src/Makefile.am
trunk/vice/src/arch/amigaos/c128uires.h
trunk/vice/src/arch/amigaos/c64uires.h
trunk/vice/src/arch/amigaos/cbm2uires.h
trunk/vice/src/arch/amigaos/intl.c
trunk/vice/src/arch/amigaos/intl.txt
trunk/vice/src/arch/amigaos/joyai.c
trunk/vice/src/arch/amigaos/petuires.h
trunk/vice/src/arch/amigaos/plus4uires.h
trunk/vice/src/arch/amigaos/private.h
trunk/vice/src/arch/amigaos/ui.c
trunk/vice/src/arch/amigaos/uires.h
trunk/vice/src/arch/amigaos/vic20uires.h
trunk/vice/src/arch/amigaos/video.c
trunk/vice/src/arch/win32/ui.c
Added Paths:
-----------
trunk/vice/src/clipboard.c
trunk/vice/src/clipboard.h
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/ChangeLog 2008-07-04 17:02:11 UTC (rev 18955)
@@ -1,3 +1,21 @@
+2008-07-04 Marco van den Heuvel <bla...@ya...>
+
+ * Makefile.am, arch/win32/ui.c, clipboard.c, clipboard.h: Moved
+ the common clipboard code that Spiro made to the new common
+ files called 'clipboard.c' and 'clipboard.h'.
+
+ * arch/amigaos/c128uires.h, arch/amigaos/c64uires.h,
+ arch/amigaos/cbm2uires.h, arch/amigaos/intl.c,
+ arch/amigaos/intl.txt, arch/amigaos/petuires.h,
+ arch/amigaos/plus4uires.h, arch/amigaos/private.h,
+ arch/amigaos/ui.c, arch/amigaos/uires.h,
+ arch/amigaos/vic20uires.h: Added text-only copy and paste
+ support to the amiga ports.
+
+ * arch/amigaos/joyai.c: Corrected some typos.
+
+ * arch/amigaos/video.c: Fixed a wrongly placed #endif.
+
2008-07-04 Spiro Trikaliotis <spi...@gm...>
* arch/unix/macosx/Makefile.am: Make sure the file
Modified: trunk/vice/src/Makefile.am
===================================================================
--- trunk/vice/src/Makefile.am 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/Makefile.am 2008-07-04 17:02:11 UTC (rev 18955)
@@ -98,6 +98,7 @@
charset.h \
cia.h \
clkguard.h \
+ clipboard.h \
cmdline.h \
color.h \
config.h.in \
@@ -199,6 +200,7 @@
autostart.c \
charset.c \
clkguard.c \
+ clipboard.c \
cmdline.c \
cbmdos.c \
cbmimage.c \
Modified: trunk/vice/src/arch/amigaos/c128uires.h
===================================================================
--- trunk/vice/src/arch/amigaos/c128uires.h 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/amigaos/c128uires.h 2008-07-04 17:02:11 UTC (rev 18955)
@@ -110,6 +110,9 @@
SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
ITEMSEPARATOR()
ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
TITLE(IDMS_SNAPSHOT, NULL)
ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
Modified: trunk/vice/src/arch/amigaos/c64uires.h
===================================================================
--- trunk/vice/src/arch/amigaos/c64uires.h 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/amigaos/c64uires.h 2008-07-04 17:02:11 UTC (rev 18955)
@@ -110,6 +110,9 @@
SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
ITEMSEPARATOR()
ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
TITLE(IDMS_SNAPSHOT, NULL)
ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
Modified: trunk/vice/src/arch/amigaos/cbm2uires.h
===================================================================
--- trunk/vice/src/arch/amigaos/cbm2uires.h 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/amigaos/cbm2uires.h 2008-07-04 17:02:11 UTC (rev 18955)
@@ -80,6 +80,9 @@
SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
ITEMSEPARATOR()
ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
TITLE(IDMS_SNAPSHOT, NULL)
ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
Modified: trunk/vice/src/arch/amigaos/intl.c
===================================================================
--- trunk/vice/src/arch/amigaos/intl.c 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/amigaos/intl.c 2008-07-04 17:02:11 UTC (rev 18955)
@@ -723,6 +723,33 @@
/* pl */ {IDMS_EXIT_PL, ""}, /* fuzzy */
/* sv */ {IDMS_EXIT_SV, "Avsluta"},
+/* en */ {IDMS_EDIT, "Edit"},
+/* de */ {IDMS_EDIT_DE, ""}, /* fuzzy */
+/* fr */ {IDMS_EDIT_FR, ""}, /* fuzzy */
+/* hu */ {IDMS_EDIT_HU, ""}, /* fuzzy */
+/* it */ {IDMS_EDIT_IT, ""}, /* fuzzy */
+/* nl */ {IDMS_EDIT_NL, "Bewerken"},
+/* pl */ {IDMS_EDIT_PL, ""}, /* fuzzy */
+/* sv */ {IDMS_EDIT_SV, ""}, /* fuzzy */
+
+/* en */ {IDMS_COPY, "Copy"},
+/* de */ {IDMS_COPY_DE, ""}, /* fuzzy */
+/* fr */ {IDMS_COPY_FR, ""}, /* fuzzy */
+/* hu */ {IDMS_COPY_HU, ""}, /* fuzzy */
+/* it */ {IDMS_COPY_IT, ""}, /* fuzzy */
+/* nl */ {IDMS_COPY_NL, "Kopie"},
+/* pl */ {IDMS_COPY_PL, ""}, /* fuzzy */
+/* sv */ {IDMS_COPY_SV, ""}, /* fuzzy */
+
+/* en */ {IDMS_PASTE, "Paste"},
+/* de */ {IDMS_PASTE_DE, ""}, /* fuzzy */
+/* fr */ {IDMS_PASTE_FR, ""}, /* fuzzy */
+/* hu */ {IDMS_PASTE_HU, ""}, /* fuzzy */
+/* it */ {IDMS_PASTE_IT, ""}, /* fuzzy */
+/* nl */ {IDMS_PASTE_NL, "Plakken"},
+/* pl */ {IDMS_PASTE_PL, ""}, /* fuzzy */
+/* sv */ {IDMS_PASTE_SV, ""}, /* fuzzy */
+
/* en */ {IDMS_SNAPSHOT, "Snapshot"},
/* de */ {IDMS_SNAPSHOT_DE, "Snapshot"},
/* fr */ {IDMS_SNAPSHOT_FR, "Sauvegarde"},
Modified: trunk/vice/src/arch/amigaos/intl.txt
===================================================================
--- trunk/vice/src/arch/amigaos/intl.txt 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/amigaos/intl.txt 2008-07-04 17:02:11 UTC (rev 18955)
@@ -134,6 +134,12 @@
IDMS_EXIT
+IDMS_EDIT
+
+IDMS_COPY
+
+IDMS_PASTE
+
IDMS_SNAPSHOT
IDMS_LOAD_SNAPSHOT_IMAGE
Modified: trunk/vice/src/arch/amigaos/joyai.c
===================================================================
--- trunk/vice/src/arch/amigaos/joyai.c 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/amigaos/joyai.c 2008-07-04 17:02:11 UTC (rev 18955)
@@ -901,7 +901,7 @@
}
if (AIN_ReadDevice(CTX, ai_handle[joy-1], &ptr) == TRUE) {
- unsigend int i, *data = ptr;
+ unsigned int i, *data = ptr;
for (i=0; i<NUM_KEYSYM; i++) {
switch (keysym[i].type) {
@@ -1002,7 +1002,7 @@
{
BYTE value = 0;
keysym_type *keysym = (joy == 2) ? keysym_2 : keysym_1;
- unsigend int i;
+ unsigned int i;
for (i=0; i<NUM_KEYSYM; i++) {
if ((keysym[i].type == TYPE_NONE) && (keysym[i].rawkey == kcode)) {
Modified: trunk/vice/src/arch/amigaos/petuires.h
===================================================================
--- trunk/vice/src/arch/amigaos/petuires.h 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/amigaos/petuires.h 2008-07-04 17:02:11 UTC (rev 18955)
@@ -80,6 +80,9 @@
SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
ITEMSEPARATOR()
ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
TITLE(IDMS_SNAPSHOT, NULL)
ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
Modified: trunk/vice/src/arch/amigaos/plus4uires.h
===================================================================
--- trunk/vice/src/arch/amigaos/plus4uires.h 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/amigaos/plus4uires.h 2008-07-04 17:02:11 UTC (rev 18955)
@@ -90,6 +90,9 @@
SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
ITEMSEPARATOR()
ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
TITLE(IDMS_SNAPSHOT, NULL)
ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
Modified: trunk/vice/src/arch/amigaos/private.h
===================================================================
--- trunk/vice/src/arch/amigaos/private.h 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/amigaos/private.h 2008-07-04 17:02:11 UTC (rev 18955)
@@ -66,6 +66,7 @@
#include <proto/asl.h>
#include <proto/graphics.h>
#include <proto/dos.h>
+#include <proto/iffparse.h>
struct os_s {
struct Screen *screen;
Modified: trunk/vice/src/arch/amigaos/ui.c
===================================================================
--- trunk/vice/src/arch/amigaos/ui.c 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/amigaos/ui.c 2008-07-04 17:02:11 UTC (rev 18955)
@@ -24,9 +24,12 @@
*
*/
+#include "vice.h"
+
#include <string.h>
#include "private.h"
+#include "clipboard.h"
#include "datasette.h"
#include "tape.h"
#include "statusbar.h"
@@ -52,6 +55,7 @@
#include "translate.h"
#include "screen-shot.h"
#include "ui.h"
+#include "util.h"
#include "mui/filereq.h"
#include "mui/uidatasette.h"
@@ -218,6 +222,141 @@
machine_specific_values = valuelist;
}
+#define ID_FTXT MAKE_ID('F','T','X','T')
+#define ID_CHRS MAKE_ID('C','H','R','S')
+
+struct Library *IFFParseBase;
+
+static void ui_copy_clipboard(void)
+{
+ struct IFFHandle *iff = NULL;
+ long unitnumber = 0;
+ long error;
+ int textlen;
+ char *text = NULL;
+
+ do {
+ text = clipboard_read_screen_output("\n");
+
+ if (text == NULL)
+ break;
+
+ if (!(IFFParseBase = OpenLibrary("iffparse.library", 0L)))
+ break;
+
+ if (!(iff = AllocIFF()))
+ break;
+
+ if (!(iff->iff_Stream = (ULONG)OpenClipboard(unitnumber)))
+ break;
+
+ InitIFFasClip (iff);
+
+ if (error = OpenIFF(iff, IFFF_WRITE))
+ break;
+
+ if (!(error=PushChunk(iff, ID_FTXT, ID_FORM, IFFSIZE_UNKNOWN)))
+ {
+ if (!(error=PushChunk(iff, 0, ID_CHRS, IFFSIZE_UNKNOWN)))
+ {
+ textlen = strlen(text);
+ WriteChunkBytes(iff, text, textlen);
+ }
+ }
+
+ } while (0);
+
+ if (iff)
+ {
+ CloseIFF(iff);
+
+ if (iff->iff_Stream)
+ CloseClipboard((struct ClipboardHandle *)iff->iff_Stream);
+ FreeIFF(iff);
+ }
+
+ if (IFFParseBase)
+ CloseLibrary(IFFParseBase);
+
+ if (text)
+ lib_free(text);
+}
+
+static void ui_paste_clipboard_text(void)
+{
+ struct IFFHandle *iff = NULL;
+ struct ContextNode *cn;
+ long unitnumber = 0;
+ long error;
+ int textlen;
+ char *text_in_petscii = NULL;
+
+ do {
+ if (!(IFFParseBase = OpenLibrary("iffparse.library", 0L)))
+ break;
+
+ if (!(iff = AllocIFF()))
+ break;
+
+ if (!(iff->iff_Stream = (ULONG)OpenClipboard(unitnumber)))
+ break;
+
+ InitIFFasClip (iff);
+
+ if (error = OpenIFF(iff, IFFF_READ))
+ break;
+
+ if (error = StopChunk(iff, ID_FTXT, ID_CHRS))
+ break;
+
+ while(1)
+ {
+ error = ParseIFF(iff, IFFPARSE_SCAN);
+ if (error == IFFERR_EOC)
+ continue;
+ else
+ if (error)
+ break;
+
+ cn = CurrentChunk(iff);
+
+ if ((cn) && (cn->cn_Type == ID_FTXT) && (cn->cn_ID == ID_CHRS))
+ {
+ textlen = cn->cn_Size;
+ text_in_petscii = lib_malloc(textlen + 1);
+ error = ReadChunkBytes(iff, text_in_petscii, textlen);
+ break;
+ }
+ }
+
+ if (text_in_petscii == NULL)
+ break;
+
+ text_in_petscii[textlen] = 0;
+
+ charset_petconvstring(text_in_petscii, 0);
+
+ kbdbuf_feed(text_in_petscii);
+
+ } while (0);
+
+ if (iff)
+ {
+ CloseIFF(iff);
+
+ if (iff->iff_Stream)
+ CloseClipboard((struct ClipboardHandle *)iff->iff_Stream);
+ FreeIFF(iff);
+ }
+
+ if (IFFParseBase)
+ CloseLibrary(IFFParseBase);
+
+ if (text_in_petscii) {
+ lib_free(text_in_petscii);
+ }
+}
+
int ui_menu_create(video_canvas_t *canvas)
{
struct Screen* pubscreen = NULL;
@@ -465,6 +604,12 @@
case IDM_RESET_DRIVE11:
drivecpu_trigger_reset(3);
break;
+ case IDM_COPY:
+ ui_copy_clipboard();
+ break;
+ case IDM_PASTE:
+ ui_paste_clipboard_text();
+ break;
#ifdef AMIGA_OS4
case IDM_JOY_SETTINGS:
ui_joystick_settings_dialog();
Modified: trunk/vice/src/arch/amigaos/uires.h
===================================================================
--- trunk/vice/src/arch/amigaos/uires.h 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/amigaos/uires.h 2008-07-04 17:02:11 UTC (rev 18955)
@@ -56,6 +56,8 @@
IDM_RESET_DRIVE8, IDM_RESET_DRIVE9, IDM_RESET_DRIVE10, IDM_RESET_DRIVE11,
IDM_EXIT,
+ IDM_COPY, IDM_PASTE,
+
IDM_SNAPSHOT_LOAD, IDM_SNAPSHOT_SAVE,
IDM_EVENT_TOGGLE_RECORD, IDM_EVENT_TOGGLE_PLAYBACK, IDM_EVENT_SETMILESTONE,
IDM_EVENT_RESETMILESTONE, IDM_EVENT_START_MODE_SAVE, IDM_EVENT_START_MODE_LOAD,
Modified: trunk/vice/src/arch/amigaos/vic20uires.h
===================================================================
--- trunk/vice/src/arch/amigaos/vic20uires.h 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/amigaos/vic20uires.h 2008-07-04 17:02:11 UTC (rev 18955)
@@ -88,6 +88,9 @@
SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
ITEMSEPARATOR()
ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
TITLE(IDMS_SNAPSHOT, NULL)
ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
Modified: trunk/vice/src/arch/amigaos/video.c
===================================================================
--- trunk/vice/src/arch/amigaos/video.c 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/amigaos/video.c 2008-07-04 17:02:11 UTC (rev 18955)
@@ -959,13 +959,13 @@
int c = ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3);
return c;
}
+#endif
static int makecol_RGB555BE(int r, int g, int b)
{
int c = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
return c;
}
-#endif
static int makecol_BGR555BE(int r, int g, int b)
{
Modified: trunk/vice/src/arch/win32/ui.c
===================================================================
--- trunk/vice/src/arch/win32/ui.c 2008-07-04 16:43:52 UTC (rev 18954)
+++ trunk/vice/src/arch/win32/ui.c 2008-07-04 17:02:11 UTC (rev 18955)
@@ -42,6 +42,7 @@
#include "autostart.h"
#include "archdep.h"
#include "charset.h"
+#include "clipboard.h"
#include "debug.h"
#include "drive.h"
#include "drivecpu.h"
@@ -982,65 +983,6 @@
/* ------------------------------------------------------------------------ */
-static char * read_screen_output(void)
-{
- char * outputbuffer = NULL;
-
- do {
- WORD base;
- BYTE allrows, allcols;
- unsigned int row, col;
- unsigned int size;
- int bank;
- char * p;
-
- mem_get_screen_parameter(&base, &allrows, &allcols, &bank);
-
- 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(bank, 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;
@@ -1059,7 +1001,7 @@
break;
}
- text = read_screen_output();
+ text = clipboard_read_screen_output("\r\n");
if (text == NULL) {
break;
}
Added: trunk/vice/src/clipboard.c
===================================================================
--- trunk/vice/src/clipboard.c (rev 0)
+++ trunk/vice/src/clipboard.c 2008-07-04 17:02:11 UTC (rev 18955)
@@ -0,0 +1,97 @@
+/*
+ * clipboard.c - Common clipboard related functions.
+ *
+ * Written by
+ * Spiro Trikaliotis <Spi...@gm...>
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <assert.h>
+#include <string.h>
+
+#include "charset.h"
+#include "lib.h"
+#include "mem.h"
+#include "types.h"
+
+char *clipboard_read_screen_output(char *line_ending)
+{
+ char * outputbuffer = NULL;
+
+ do {
+ WORD base;
+ BYTE allrows, allcols;
+ unsigned int row, col;
+ unsigned int size;
+ unsigned int line_ending_length = strlen(line_ending);
+ int bank;
+ int i;
+ char * p;
+
+ mem_get_screen_parameter(&base, &allrows, &allcols, &bank);
+
+ size = allrows * (allcols + line_ending_length) + 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(bank, 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 line-ending */
+
+ for (i = 0; i < line_ending_length; i++)
+ *p++ = line_ending[i];
+ }
+
+ *p = 0;
+
+ assert(p < outputbuffer + size);
+
+ } while (0);
+
+ return outputbuffer;
+}
Property changes on: trunk/vice/src/clipboard.c
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/vice/src/clipboard.h
===================================================================
--- trunk/vice/src/clipboard.h (rev 0)
+++ trunk/vice/src/clipboard.h 2008-07-04 17:02:11 UTC (rev 18955)
@@ -0,0 +1,35 @@
+/*
+ * clipboard.c - Common clipboard related functions.
+ *
+ * Written by
+ * Spiro Trikaliotis <Spi...@gm...>
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#ifndef _CLIPBOARD_H
+#define _CLIPBOARD_H
+
+#include "vice.h"
+
+extern char *clipboard_read_screen_output(char *line_ending);
+
+#endif
Property changes on: trunk/vice/src/clipboard.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-04 16:43:46
|
Revision: 18954
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18954&view=rev
Author: strik
Date: 2008-07-04 09:43:52 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
2008-07-04 Spiro Trikaliotis <spi...@gm...>
* Makefile.am: Make sure the file Doxyfile is included in the
source distribution.
* doc/html/Makefile.am: Make sure the files hpux.html and
sco.html are included in the source distribution.
* src/arch/unix/macosx/Makefile.am: Make sure the file
VICE.xcodeproj/project.pbxproj is included in the source
distribution.
* src/arch/unix/macosx/Resources/English.lproj/Makefile.am: Make
sure some MacOS files are included in the source distribution.
Modified Paths:
--------------
trunk/vice/ChangeLog
trunk/vice/Makefile.am
trunk/vice/doc/html/Makefile.am
trunk/vice/src/ChangeLog
trunk/vice/src/arch/unix/macosx/Makefile.am
trunk/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am
Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog 2008-07-04 07:23:11 UTC (rev 18953)
+++ trunk/vice/ChangeLog 2008-07-04 16:43:52 UTC (rev 18954)
@@ -1,3 +1,11 @@
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * Makefile.am: Make sure the file Doxyfile is included in the
+ distribution.
+
+ * doc/html/Makefile.am: Make sure the files hpux.html and
+ sco.html are included in the distribution.
+
2008-07-01 Marco van den Heuvel <bla...@ya...>
* doc/GP2X-Howto.txt, doc/Makefile.am: Added a GP2X compile
Modified: trunk/vice/Makefile.am
===================================================================
--- trunk/vice/Makefile.am 2008-07-04 07:23:11 UTC (rev 18953)
+++ trunk/vice/Makefile.am 2008-07-04 16:43:52 UTC (rev 18954)
@@ -2,7 +2,14 @@
SUBDIRS = $(POSUB) src build data man doc
-EXTRA_DIST = AUTHORS FEEDBACK COPYING INSTALL NEWS vice.spec vice-mint.spec
+EXTRA_DIST = AUTHORS \
+ FEEDBACK \
+ COPYING \
+ Doxyfile \
+ INSTALL \
+ NEWS \
+ vice.spec \
+ vice-mint.spec
.PHONY: x64 x128 xvic xpet xplus4 xcbm2
x64:
Modified: trunk/vice/doc/html/Makefile.am
===================================================================
--- trunk/vice/doc/html/Makefile.am 2008-07-04 07:23:11 UTC (rev 18953)
+++ trunk/vice/doc/html/Makefile.am 2008-07-04 16:43:52 UTC (rev 18954)
@@ -9,6 +9,7 @@
images/new.gif \
images/vice-logo.jpg \
index.html \
+ hpux.html \
macosx.html \
plain/64doc.txt \
plain/BUGS \
@@ -21,6 +22,7 @@
plain/drive_info.txt \
plain/serial.txt \
qnx.html \
+ sco.html \
solaris.html \
vice_1.html \
vice_2.html \
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-07-04 07:23:11 UTC (rev 18953)
+++ trunk/vice/src/ChangeLog 2008-07-04 16:43:52 UTC (rev 18954)
@@ -1,3 +1,12 @@
+2008-07-04 Spiro Trikaliotis <spi...@gm...>
+
+ * arch/unix/macosx/Makefile.am: Make sure the file
+ VICE.xcodeproj/project.pbxproj is included in the source
+ distribution.
+
+ * arch/unix/macosx/Resources/English.lproj/Makefile.am: Make
+ sure some MacOS files are included in the source distribution.
+
2008-07-01 Marco van den Heuvel <bla...@ya...>
* arch/win32/ui.c, c128/c128mem.c, c64/c64mem.c, cbm2/cbm2mem.c,
Modified: trunk/vice/src/arch/unix/macosx/Makefile.am
===================================================================
--- trunk/vice/src/arch/unix/macosx/Makefile.am 2008-07-04 07:23:11 UTC (rev 18953)
+++ trunk/vice/src/arch/unix/macosx/Makefile.am 2008-07-04 16:43:52 UTC (rev 18954)
@@ -27,4 +27,5 @@
Info.plist \
make-bindist.sh \
x11-launcher.sh \
- vice-launcher.sh
+ vice-launcher.sh \
+ VICE.xcodeproj/project.pbxproj
Modified: trunk/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am
===================================================================
--- trunk/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am 2008-07-04 07:23:11 UTC (rev 18953)
+++ trunk/vice/src/arch/unix/macosx/Resources/English.lproj/Makefile.am 2008-07-04 16:43:52 UTC (rev 18954)
@@ -16,10 +16,16 @@
PrinterSettings.nib/keyedobjects.nib \
KeyboardSettings.nib/classes.nib \
KeyboardSettings.nib/info.nib \
- KeyboardSettings.nib/keyedobjects.nib
+ KeyboardSettings.nib/keyedobjects.nib \
JoystickSettings.nib/classes.nib \
JoystickSettings.nib/info.nib \
JoystickSettings.nib/keyedobjects.nib \
+ RecordMedia.nib/classes.nib \
+ RecordMedia.nib/info.nib \
ResourceEditor.nib/classes.nib \
ResourceEditor.nib/info.nib \
- ResourceEditor.nib/keyedobjects.nib
+ ResourceEditor.nib/keyedobjects.nib \
+ ResourceTree.plist \
+ SoundSettings.nib/classes.nib \
+ SoundSettings.nib/info.nib \
+ SoundSettings.nib/keyedobjects.nib
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bla...@us...> - 2008-07-04 07:23:07
|
Revision: 18953
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18953&view=rev
Author: blackystardust
Date: 2008-07-04 00:23:11 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
put the clipboard related common code in a new file clipboard.c, and added copy/paste support for the amiga ports.
Modified Paths:
--------------
branches/marco/ports/vice/src/Makefile.am
branches/marco/ports/vice/src/arch/amigaos/c128uires.h
branches/marco/ports/vice/src/arch/amigaos/c64uires.h
branches/marco/ports/vice/src/arch/amigaos/cbm2uires.h
branches/marco/ports/vice/src/arch/amigaos/intl.c
branches/marco/ports/vice/src/arch/amigaos/intl.txt
branches/marco/ports/vice/src/arch/amigaos/joyai.c
branches/marco/ports/vice/src/arch/amigaos/petuires.h
branches/marco/ports/vice/src/arch/amigaos/plus4uires.h
branches/marco/ports/vice/src/arch/amigaos/private.h
branches/marco/ports/vice/src/arch/amigaos/ui.c
branches/marco/ports/vice/src/arch/amigaos/uires.h
branches/marco/ports/vice/src/arch/amigaos/vic20uires.h
branches/marco/ports/vice/src/arch/amigaos/video.c
branches/marco/ports/vice/src/arch/win32/ui.c
Added Paths:
-----------
branches/marco/ports/vice/src/clipboard.c
branches/marco/ports/vice/src/clipboard.h
Modified: branches/marco/ports/vice/src/Makefile.am
===================================================================
--- branches/marco/ports/vice/src/Makefile.am 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/Makefile.am 2008-07-04 07:23:11 UTC (rev 18953)
@@ -98,6 +98,7 @@
charset.h \
cia.h \
clkguard.h \
+ clipboard.h \
cmdline.h \
color.h \
config.h.in \
@@ -199,6 +200,7 @@
autostart.c \
charset.c \
clkguard.c \
+ clipboard.c \
cmdline.c \
cbmdos.c \
cbmimage.c \
Modified: branches/marco/ports/vice/src/arch/amigaos/c128uires.h
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/c128uires.h 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/amigaos/c128uires.h 2008-07-04 07:23:11 UTC (rev 18953)
@@ -110,6 +110,9 @@
SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
ITEMSEPARATOR()
ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
TITLE(IDMS_SNAPSHOT, NULL)
ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
Modified: branches/marco/ports/vice/src/arch/amigaos/c64uires.h
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/c64uires.h 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/amigaos/c64uires.h 2008-07-04 07:23:11 UTC (rev 18953)
@@ -110,6 +110,9 @@
SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
ITEMSEPARATOR()
ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
TITLE(IDMS_SNAPSHOT, NULL)
ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
Modified: branches/marco/ports/vice/src/arch/amigaos/cbm2uires.h
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/cbm2uires.h 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/amigaos/cbm2uires.h 2008-07-04 07:23:11 UTC (rev 18953)
@@ -80,6 +80,9 @@
SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
ITEMSEPARATOR()
ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
TITLE(IDMS_SNAPSHOT, NULL)
ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
Modified: branches/marco/ports/vice/src/arch/amigaos/intl.c
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/intl.c 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/amigaos/intl.c 2008-07-04 07:23:11 UTC (rev 18953)
@@ -723,6 +723,33 @@
/* pl */ {IDMS_EXIT_PL, ""}, /* fuzzy */
/* sv */ {IDMS_EXIT_SV, "Avsluta"},
+/* en */ {IDMS_EDIT, "Edit"},
+/* de */ {IDMS_EDIT_DE, ""}, /* fuzzy */
+/* fr */ {IDMS_EDIT_FR, ""}, /* fuzzy */
+/* hu */ {IDMS_EDIT_HU, ""}, /* fuzzy */
+/* it */ {IDMS_EDIT_IT, ""}, /* fuzzy */
+/* nl */ {IDMS_EDIT_NL, "Bewerken"},
+/* pl */ {IDMS_EDIT_PL, ""}, /* fuzzy */
+/* sv */ {IDMS_EDIT_SV, ""}, /* fuzzy */
+
+/* en */ {IDMS_COPY, "Copy"},
+/* de */ {IDMS_COPY_DE, ""}, /* fuzzy */
+/* fr */ {IDMS_COPY_FR, ""}, /* fuzzy */
+/* hu */ {IDMS_COPY_HU, ""}, /* fuzzy */
+/* it */ {IDMS_COPY_IT, ""}, /* fuzzy */
+/* nl */ {IDMS_COPY_NL, "Kopie"},
+/* pl */ {IDMS_COPY_PL, ""}, /* fuzzy */
+/* sv */ {IDMS_COPY_SV, ""}, /* fuzzy */
+
+/* en */ {IDMS_PASTE, "Paste"},
+/* de */ {IDMS_PASTE_DE, ""}, /* fuzzy */
+/* fr */ {IDMS_PASTE_FR, ""}, /* fuzzy */
+/* hu */ {IDMS_PASTE_HU, ""}, /* fuzzy */
+/* it */ {IDMS_PASTE_IT, ""}, /* fuzzy */
+/* nl */ {IDMS_PASTE_NL, "Plakken"},
+/* pl */ {IDMS_PASTE_PL, ""}, /* fuzzy */
+/* sv */ {IDMS_PASTE_SV, ""}, /* fuzzy */
+
/* en */ {IDMS_SNAPSHOT, "Snapshot"},
/* de */ {IDMS_SNAPSHOT_DE, "Snapshot"},
/* fr */ {IDMS_SNAPSHOT_FR, "Sauvegarde"},
Modified: branches/marco/ports/vice/src/arch/amigaos/intl.txt
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/intl.txt 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/amigaos/intl.txt 2008-07-04 07:23:11 UTC (rev 18953)
@@ -134,6 +134,12 @@
IDMS_EXIT
+IDMS_EDIT
+
+IDMS_COPY
+
+IDMS_PASTE
+
IDMS_SNAPSHOT
IDMS_LOAD_SNAPSHOT_IMAGE
Modified: branches/marco/ports/vice/src/arch/amigaos/joyai.c
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/joyai.c 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/amigaos/joyai.c 2008-07-04 07:23:11 UTC (rev 18953)
@@ -901,7 +901,7 @@
}
if (AIN_ReadDevice(CTX, ai_handle[joy-1], &ptr) == TRUE) {
- unsigend int i, *data = ptr;
+ unsigned int i, *data = ptr;
for (i=0; i<NUM_KEYSYM; i++) {
switch (keysym[i].type) {
@@ -1002,7 +1002,7 @@
{
BYTE value = 0;
keysym_type *keysym = (joy == 2) ? keysym_2 : keysym_1;
- unsigend int i;
+ unsigned int i;
for (i=0; i<NUM_KEYSYM; i++) {
if ((keysym[i].type == TYPE_NONE) && (keysym[i].rawkey == kcode)) {
Modified: branches/marco/ports/vice/src/arch/amigaos/petuires.h
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/petuires.h 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/amigaos/petuires.h 2008-07-04 07:23:11 UTC (rev 18953)
@@ -80,6 +80,9 @@
SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
ITEMSEPARATOR()
ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
TITLE(IDMS_SNAPSHOT, NULL)
ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
Modified: branches/marco/ports/vice/src/arch/amigaos/plus4uires.h
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/plus4uires.h 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/amigaos/plus4uires.h 2008-07-04 07:23:11 UTC (rev 18953)
@@ -90,6 +90,9 @@
SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
ITEMSEPARATOR()
ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
TITLE(IDMS_SNAPSHOT, NULL)
ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
Modified: branches/marco/ports/vice/src/arch/amigaos/private.h
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/private.h 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/amigaos/private.h 2008-07-04 07:23:11 UTC (rev 18953)
@@ -66,6 +66,7 @@
#include <proto/asl.h>
#include <proto/graphics.h>
#include <proto/dos.h>
+#include <proto/iffparse.h>
struct os_s {
struct Screen *screen;
Modified: branches/marco/ports/vice/src/arch/amigaos/ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/ui.c 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/amigaos/ui.c 2008-07-04 07:23:11 UTC (rev 18953)
@@ -24,9 +24,12 @@
*
*/
+#include "vice.h"
+
#include <string.h>
#include "private.h"
+#include "clipboard.h"
#include "datasette.h"
#include "tape.h"
#include "statusbar.h"
@@ -52,6 +55,7 @@
#include "translate.h"
#include "screen-shot.h"
#include "ui.h"
+#include "util.h"
#include "mui/filereq.h"
#include "mui/uidatasette.h"
@@ -218,6 +222,141 @@
machine_specific_values = valuelist;
}
+#define ID_FTXT MAKE_ID('F','T','X','T')
+#define ID_CHRS MAKE_ID('C','H','R','S')
+
+struct Library *IFFParseBase;
+
+static void ui_copy_clipboard(void)
+{
+ struct IFFHandle *iff = NULL;
+ long unitnumber = 0;
+ long error;
+ int textlen;
+ char *text = NULL;
+
+ do {
+ text = clipboard_read_screen_output("\n");
+
+ if (text == NULL)
+ break;
+
+ if (!(IFFParseBase = OpenLibrary("iffparse.library", 0L)))
+ break;
+
+ if (!(iff = AllocIFF()))
+ break;
+
+ if (!(iff->iff_Stream = (ULONG)OpenClipboard(unitnumber)))
+ break;
+
+ InitIFFasClip (iff);
+
+ if (error = OpenIFF(iff, IFFF_WRITE))
+ break;
+
+ if (!(error=PushChunk(iff, ID_FTXT, ID_FORM, IFFSIZE_UNKNOWN)))
+ {
+ if (!(error=PushChunk(iff, 0, ID_CHRS, IFFSIZE_UNKNOWN)))
+ {
+ textlen = strlen(text);
+ WriteChunkBytes(iff, text, textlen);
+ }
+ }
+
+ } while (0);
+
+ if (iff)
+ {
+ CloseIFF(iff);
+
+ if (iff->iff_Stream)
+ CloseClipboard((struct ClipboardHandle *)iff->iff_Stream);
+ FreeIFF(iff);
+ }
+
+ if (IFFParseBase)
+ CloseLibrary(IFFParseBase);
+
+ if (text)
+ lib_free(text);
+}
+
+static void ui_paste_clipboard_text(void)
+{
+ struct IFFHandle *iff = NULL;
+ struct ContextNode *cn;
+ long unitnumber = 0;
+ long error;
+ int textlen;
+ char *text_in_petscii = NULL;
+
+ do {
+ if (!(IFFParseBase = OpenLibrary("iffparse.library", 0L)))
+ break;
+
+ if (!(iff = AllocIFF()))
+ break;
+
+ if (!(iff->iff_Stream = (ULONG)OpenClipboard(unitnumber)))
+ break;
+
+ InitIFFasClip (iff);
+
+ if (error = OpenIFF(iff, IFFF_READ))
+ break;
+
+ if (error = StopChunk(iff, ID_FTXT, ID_CHRS))
+ break;
+
+ while(1)
+ {
+ error = ParseIFF(iff, IFFPARSE_SCAN);
+ if (error == IFFERR_EOC)
+ continue;
+ else
+ if (error)
+ break;
+
+ cn = CurrentChunk(iff);
+
+ if ((cn) && (cn->cn_Type == ID_FTXT) && (cn->cn_ID == ID_CHRS))
+ {
+ textlen = cn->cn_Size;
+ text_in_petscii = lib_malloc(textlen + 1);
+ error = ReadChunkBytes(iff, text_in_petscii, textlen);
+ break;
+ }
+ }
+
+ if (text_in_petscii == NULL)
+ break;
+
+ text_in_petscii[textlen] = 0;
+
+ charset_petconvstring(text_in_petscii, 0);
+
+ kbdbuf_feed(text_in_petscii);
+
+ } while (0);
+
+ if (iff)
+ {
+ CloseIFF(iff);
+
+ if (iff->iff_Stream)
+ CloseClipboard((struct ClipboardHandle *)iff->iff_Stream);
+ FreeIFF(iff);
+ }
+
+ if (IFFParseBase)
+ CloseLibrary(IFFParseBase);
+
+ if (text_in_petscii) {
+ lib_free(text_in_petscii);
+ }
+}
+
int ui_menu_create(video_canvas_t *canvas)
{
struct Screen* pubscreen = NULL;
@@ -465,6 +604,12 @@
case IDM_RESET_DRIVE11:
drivecpu_trigger_reset(3);
break;
+ case IDM_COPY:
+ ui_copy_clipboard();
+ break;
+ case IDM_PASTE:
+ ui_paste_clipboard_text();
+ break;
#ifdef AMIGA_OS4
case IDM_JOY_SETTINGS:
ui_joystick_settings_dialog();
Modified: branches/marco/ports/vice/src/arch/amigaos/uires.h
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/uires.h 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/amigaos/uires.h 2008-07-04 07:23:11 UTC (rev 18953)
@@ -56,6 +56,8 @@
IDM_RESET_DRIVE8, IDM_RESET_DRIVE9, IDM_RESET_DRIVE10, IDM_RESET_DRIVE11,
IDM_EXIT,
+ IDM_COPY, IDM_PASTE,
+
IDM_SNAPSHOT_LOAD, IDM_SNAPSHOT_SAVE,
IDM_EVENT_TOGGLE_RECORD, IDM_EVENT_TOGGLE_PLAYBACK, IDM_EVENT_SETMILESTONE,
IDM_EVENT_RESETMILESTONE, IDM_EVENT_START_MODE_SAVE, IDM_EVENT_START_MODE_LOAD,
Modified: branches/marco/ports/vice/src/arch/amigaos/vic20uires.h
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/vic20uires.h 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/amigaos/vic20uires.h 2008-07-04 07:23:11 UTC (rev 18953)
@@ -88,6 +88,9 @@
SUB(IDMS_DRIVE_11, NULL, IDM_RESET_DRIVE11)
ITEMSEPARATOR()
ITEM(IDMS_EXIT, "X", IDM_EXIT)
+ TITLE(IDMS_EDIT, NULL)
+ ITEM(IDMS_COPY, NULL, IDM_COPY)
+ ITEM(IDMS_PASTE, NULL, IDM_PASTE)
TITLE(IDMS_SNAPSHOT, NULL)
ITEM(IDMS_LOAD_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_LOAD)
ITEM(IDMS_SAVE_SNAPSHOT_IMAGE, NULL, IDM_SNAPSHOT_SAVE)
Modified: branches/marco/ports/vice/src/arch/amigaos/video.c
===================================================================
--- branches/marco/ports/vice/src/arch/amigaos/video.c 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/amigaos/video.c 2008-07-04 07:23:11 UTC (rev 18953)
@@ -959,13 +959,13 @@
int c = ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3);
return c;
}
+#endif
static int makecol_RGB555BE(int r, int g, int b)
{
int c = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
return c;
}
-#endif
static int makecol_BGR555BE(int r, int g, int b)
{
Modified: branches/marco/ports/vice/src/arch/win32/ui.c
===================================================================
--- branches/marco/ports/vice/src/arch/win32/ui.c 2008-07-03 20:08:45 UTC (rev 18952)
+++ branches/marco/ports/vice/src/arch/win32/ui.c 2008-07-04 07:23:11 UTC (rev 18953)
@@ -42,6 +42,7 @@
#include "autostart.h"
#include "archdep.h"
#include "charset.h"
+#include "clipboard.h"
#include "debug.h"
#include "drive.h"
#include "drivecpu.h"
@@ -983,65 +984,6 @@
/* ------------------------------------------------------------------------ */
-static char * read_screen_output(void)
-{
- char * outputbuffer = NULL;
-
- do {
- WORD base;
- BYTE allrows, allcols;
- unsigned int row, col;
- unsigned int size;
- int bank;
- char * p;
-
- mem_get_screen_parameter(&base, &allrows, &allcols, &bank);
-
- 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(bank, 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;
@@ -1060,7 +1002,7 @@
break;
}
- text = read_screen_output();
+ text = clipboard_read_screen_output("\r\n");
if (text == NULL) {
break;
}
Added: branches/marco/ports/vice/src/clipboard.c
===================================================================
--- branches/marco/ports/vice/src/clipboard.c (rev 0)
+++ branches/marco/ports/vice/src/clipboard.c 2008-07-04 07:23:11 UTC (rev 18953)
@@ -0,0 +1,96 @@
+/*
+ * clipboard.c - Common clipboard related functions.
+ *
+ * Written by
+ * Spiro Trikaliotis <Spi...@gm...>
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#include "vice.h"
+
+#include <assert.h>
+#include <string.h>
+
+#include "charset.h"
+#include "lib.h"
+#include "mem.h"
+#include "types.h"
+
+char *clipboard_read_screen_output(char *line_ending)
+{
+ char * outputbuffer = NULL;
+
+ do {
+ WORD base;
+ BYTE allrows, allcols;
+ unsigned int row, col;
+ unsigned int size;
+ int bank;
+ int i;
+ char * p;
+
+ mem_get_screen_parameter(&base, &allrows, &allcols, &bank);
+
+ size = allrows * (allcols + strlen(line_ending)) + 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(bank, 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 line-ending */
+
+ for (i = 0; i < strlen(line_ending); i++)
+ *p++ = line_ending[i];
+ }
+
+ *p = 0;
+
+ assert(p < outputbuffer + size);
+
+ } while (0);
+
+ return outputbuffer;
+}
Property changes on: branches/marco/ports/vice/src/clipboard.c
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/marco/ports/vice/src/clipboard.h
===================================================================
--- branches/marco/ports/vice/src/clipboard.h (rev 0)
+++ branches/marco/ports/vice/src/clipboard.h 2008-07-04 07:23:11 UTC (rev 18953)
@@ -0,0 +1,35 @@
+/*
+ * clipboard.c - Common clipboard related functions.
+ *
+ * Written by
+ * Spiro Trikaliotis <Spi...@gm...>
+ * Marco van den Heuvel <bla...@ya...>
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ * 02111-1307 USA.
+ *
+ */
+
+#ifndef _CLIPBOARD_H
+#define _CLIPBOARD_H
+
+#include "vice.h"
+
+extern char *clipboard_read_screen_output(char *line_ending);
+
+#endif
Property changes on: branches/marco/ports/vice/src/clipboard.h
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2008-07-03 20:08:38
|
Revision: 18952
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18952&view=rev
Author: amatthies
Date: 2008-07-03 13:08:45 -0700 (Thu, 03 Jul 2008)
Log Message:
-----------
Copied remotely
Added Paths:
-----------
branches/amatthies/current/vice/
Copied: branches/amatthies/current/vice (from rev 18951, tags/v1.22/v1.22.22/vice)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2008-07-03 20:04:14
|
Revision: 18951
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18951&view=rev
Author: amatthies
Date: 2008-07-03 13:04:19 -0700 (Thu, 03 Jul 2008)
Log Message:
-----------
Created branch for latest working copy
Added Paths:
-----------
branches/amatthies/current/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-03 07:42:30
|
Revision: 18950
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18950&view=rev
Author: strik
Date: 2008-07-03 00:30:09 -0700 (Thu, 03 Jul 2008)
Log Message:
-----------
doc/GP2X-Howto.txt was missing in the previous commit.
Added Paths:
-----------
trunk/vice/doc/GP2X-Howto.txt
Added: trunk/vice/doc/GP2X-Howto.txt
===================================================================
--- trunk/vice/doc/GP2X-Howto.txt (rev 0)
+++ trunk/vice/doc/GP2X-Howto.txt 2008-07-03 07:30:09 UTC (rev 18950)
@@ -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.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-03 07:23:27
|
Revision: 18949
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18949&view=rev
Author: strik
Date: 2008-07-03 00:23:35 -0700 (Thu, 03 Jul 2008)
Log Message:
-----------
2008-07-01 Marco van den Heuvel <bla...@ya...>
* doc/GP2X-Howto.txt, doc/Makefile.am: Added a GP2X compile
howto text file.
* src/arch/win32/ui.c, src/c128/c128mem.c, src/c64/c64mem.c,
src/cbm2/cbm2mem.c, src/mem.h, src/monitor/monitor.c,
src/pet/petmem.c, src/plus4/plus4mem.c, src/vic20/vic20mem.c:
Fixed the returned values of the mem_get_screen_parameter() of
some of the emulators, and added a bank parameter to the
mem_get_screen_parameter() function, this was needed to get it
to work for xcbm2.
* src/sound.h: Added a static inline 2-channel digital audio
mixing routine.
* src/c64/digimax.c, src/pet/petsound.c, src/plus4/ted-sound.c,
src/vic20/vic20sound.c: Fixed to use proper digital audio
mixing.
Modified Paths:
--------------
trunk/vice/ChangeLog
trunk/vice/doc/Makefile.am
trunk/vice/src/ChangeLog
trunk/vice/src/arch/win32/ui.c
trunk/vice/src/c128/c128mem.c
trunk/vice/src/c64/c64mem.c
trunk/vice/src/c64/digimax.c
trunk/vice/src/cbm2/cbm2mem.c
trunk/vice/src/mem.h
trunk/vice/src/monitor/monitor.c
trunk/vice/src/pet/petmem.c
trunk/vice/src/pet/petsound.c
trunk/vice/src/plus4/plus4mem.c
trunk/vice/src/plus4/ted-sound.c
trunk/vice/src/sound.h
trunk/vice/src/vic20/vic20mem.c
trunk/vice/src/vic20/vic20sound.c
Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/ChangeLog 2008-07-03 07:23:35 UTC (rev 18949)
@@ -1,3 +1,8 @@
+2008-07-01 Marco van den Heuvel <bla...@ya...>
+
+ * doc/GP2X-Howto.txt, doc/Makefile.am: Added a GP2X compile
+ howto text file.
+
2008-07-02 Andreas Matthies <and...@gm...>
* doc/html/plain/BUGS, NEWS: Updated.
Modified: trunk/vice/doc/Makefile.am
===================================================================
--- trunk/vice/doc/Makefile.am 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/doc/Makefile.am 2008-07-03 07:23:35 UTC (rev 18949)
@@ -17,7 +17,8 @@
cartconv.txt \
iec-bus.txt \
mon.txt \
- openGLsync-howto.txt
+ openGLsync-howto.txt \
+ GP2X-Howto.txt
info_TEXINFOS = vice.texi
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/ChangeLog 2008-07-03 07:23:35 UTC (rev 18949)
@@ -1,3 +1,18 @@
+2008-07-01 Marco van den Heuvel <bla...@ya...>
+
+ * arch/win32/ui.c, c128/c128mem.c, c64/c64mem.c, cbm2/cbm2mem.c,
+ mem.h, monitor/monitor.c, pet/petmem.c, plus4/plus4mem.c,
+ vic20/vic20mem.c: Fixed the returned values of the
+ mem_get_screen_parameter() of some of the emulators, and added a
+ bank parameter to the mem_get_screen_parameter() function, this
+ was needed to get it to work for xcbm2.
+
+ * sound.h: Added a static inline 2-channel digital audio mixing
+ routine.
+
+ * c64/digimax.c, pet/petsound.c, plus4/ted-sound.c,
+ vic20/vic20sound.c: Fixed to use proper digital audio mixing.
+
2008-07-02 Spiro Trikaliotis <spi...@gm...>
* arch/win32/Makefile.am: Renamed _all.dsp to _vice.dsp
Modified: trunk/vice/src/arch/win32/ui.c
===================================================================
--- trunk/vice/src/arch/win32/ui.c 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/arch/win32/ui.c 2008-07-03 07:23:35 UTC (rev 18949)
@@ -991,9 +991,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;
@@ -1010,7 +1011,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: trunk/vice/src/c128/c128mem.c
===================================================================
--- trunk/vice/src/c128/c128mem.c 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/c128/c128mem.c 2008-07-03 07:23:35 UTC (rev 18949)
@@ -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: trunk/vice/src/c64/c64mem.c
===================================================================
--- trunk/vice/src/c64/c64mem.c 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/c64/c64mem.c 2008-07-03 07:23:35 UTC (rev 18949)
@@ -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: trunk/vice/src/c64/digimax.c
===================================================================
--- trunk/vice/src/c64/digimax.c 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/c64/digimax.c 2008-07-03 07:23:35 UTC (rev 18949)
@@ -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: trunk/vice/src/cbm2/cbm2mem.c
===================================================================
--- trunk/vice/src/cbm2/cbm2mem.c 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/cbm2/cbm2mem.c 2008-07-03 07:23:35 UTC (rev 18949)
@@ -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: trunk/vice/src/mem.h
===================================================================
--- trunk/vice/src/mem.h 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/mem.h 2008-07-03 07:23:35 UTC (rev 18949)
@@ -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: trunk/vice/src/monitor/monitor.c
===================================================================
--- trunk/vice/src/monitor/monitor.c 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/monitor/monitor.c 2008-07-03 07:23:35 UTC (rev 18949)
@@ -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: trunk/vice/src/pet/petmem.c
===================================================================
--- trunk/vice/src/pet/petmem.c 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/pet/petmem.c 2008-07-03 07:23:35 UTC (rev 18949)
@@ -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: trunk/vice/src/pet/petsound.c
===================================================================
--- trunk/vice/src/pet/petsound.c 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/pet/petsound.c 2008-07-03 07:23:35 UTC (rev 18949)
@@ -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: trunk/vice/src/plus4/plus4mem.c
===================================================================
--- trunk/vice/src/plus4/plus4mem.c 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/plus4/plus4mem.c 2008-07-03 07:23:35 UTC (rev 18949)
@@ -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: trunk/vice/src/plus4/ted-sound.c
===================================================================
--- trunk/vice/src/plus4/ted-sound.c 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/plus4/ted-sound.c 2008-07-03 07:23:35 UTC (rev 18949)
@@ -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: trunk/vice/src/sound.h
===================================================================
--- trunk/vice/src/sound.h 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/sound.h 2008-07-03 07:23:35 UTC (rev 18949)
@@ -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: trunk/vice/src/vic20/vic20mem.c
===================================================================
--- trunk/vice/src/vic20/vic20mem.c 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/vic20/vic20mem.c 2008-07-03 07:23:35 UTC (rev 18949)
@@ -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;
}
/************************************************************************/
Modified: trunk/vice/src/vic20/vic20sound.c
===================================================================
--- trunk/vice/src/vic20/vic20sound.c 2008-07-02 18:33:34 UTC (rev 18948)
+++ trunk/vice/src/vic20/vic20sound.c 2008-07-03 07:23:35 UTC (rev 18949)
@@ -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.
|
|
From: <st...@us...> - 2008-07-02 18:33:43
|
Revision: 18948
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18948&view=rev
Author: strik
Date: 2008-07-02 11:33:34 -0700 (Wed, 02 Jul 2008)
Log Message:
-----------
2008-07-02 Spiro Trikaliotis <spi...@gm...>
* src/arch/win32/Makefile.am: Renamed _all.dsp to _vice.dsp
* src/arch/win32/_all.dsp, src/arch/win32/_vice.dsp: renamed
_all.dsp to _vice.dsp.
Modified Paths:
--------------
trunk/vice/src/ChangeLog
trunk/vice/src/arch/win32/Makefile.am
Added Paths:
-----------
trunk/vice/src/arch/win32/_vice.dsp
Removed Paths:
-------------
trunk/vice/src/arch/win32/_all.dsp
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-07-02 17:51:38 UTC (rev 18947)
+++ trunk/vice/src/ChangeLog 2008-07-02 18:33:34 UTC (rev 18948)
@@ -1,3 +1,10 @@
+2008-07-02 Spiro Trikaliotis <spi...@gm...>
+
+ * arch/win32/Makefile.am: Renamed _all.dsp to _vice.dsp
+
+ * arch/win32/_all.dsp, arch/win32/_vice.dsp: renamed _all.dsp to
+ _vice.dsp.
+
2008-07-02 Andreas Matthies <and...@gm...>
* arch/win32/ui.c: Moved creation of accelerators to
Modified: trunk/vice/src/arch/win32/Makefile.am
===================================================================
--- trunk/vice/src/arch/win32/Makefile.am 2008-07-02 17:51:38 UTC (rev 18947)
+++ trunk/vice/src/arch/win32/Makefile.am 2008-07-02 18:33:34 UTC (rev 18948)
@@ -307,7 +307,7 @@
watcom/xplus4main.c \
watcom/xvic.tgt \
watcom/xvicmain.c \
- _all.dsp \
+ _vice.dsp \
arch.dsp \
base.dsp \
c128.dsp \
Deleted: trunk/vice/src/arch/win32/_all.dsp
===================================================================
--- trunk/vice/src/arch/win32/_all.dsp 2008-07-02 17:51:38 UTC (rev 18947)
+++ trunk/vice/src/arch/win32/_all.dsp 2008-07-02 18:33:34 UTC (rev 18948)
@@ -1,89 +0,0 @@
-# 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
Copied: trunk/vice/src/arch/win32/_vice.dsp (from rev 18945, trunk/vice/src/arch/win32/_all.dsp)
===================================================================
--- trunk/vice/src/arch/win32/_vice.dsp (rev 0)
+++ trunk/vice/src/arch/win32/_vice.dsp 2008-07-02 18:33:34 UTC (rev 18948)
@@ -0,0 +1,89 @@
+# Microsoft Developer Studio Project File - Name="_vice" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=_vice - 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 "_vice.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 "_vice.mak" CFG="_vice - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "_vice - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "_vice - 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)" == "_vice - 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)" == "_vice - 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 "_vice - Win32 Release"
+# Name "_vice - Win32 Debug"
+# End Target
+# End Project
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st...@us...> - 2008-07-02 17:51:55
|
Revision: 18947
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18947&view=rev
Author: strik
Date: 2008-07-02 10:51:38 -0700 (Wed, 02 Jul 2008)
Log Message:
-----------
2008-07-02 Andreas Matthies <and...@gm...>
* doc/html/plain/BUGS, NEWS: Updated.
* src/arch/win32/ui.c: Moved creation of accelerators to
ui_init_finish.
* src/arch/win32/uikeyboard.c: Log a warning if the shortcut
file cannot be opened.
Modified Paths:
--------------
trunk/vice/ChangeLog
trunk/vice/doc/html/plain/BUGS
trunk/vice/doc/html/plain/NEWS
trunk/vice/src/ChangeLog
trunk/vice/src/arch/win32/ui.c
trunk/vice/src/arch/win32/uikeyboard.c
Modified: trunk/vice/ChangeLog
===================================================================
--- trunk/vice/ChangeLog 2008-07-02 17:44:39 UTC (rev 18946)
+++ trunk/vice/ChangeLog 2008-07-02 17:51:38 UTC (rev 18947)
@@ -1,3 +1,7 @@
+2008-07-02 Andreas Matthies <and...@gm...>
+
+ * doc/html/plain/BUGS, NEWS: Updated.
+
2008-07-01 Spiro Trikaliotis <spi...@gm...>
* Version 1.22.22
Modified: trunk/vice/doc/html/plain/BUGS
===================================================================
--- trunk/vice/doc/html/plain/BUGS 2008-07-02 17:44:39 UTC (rev 18946)
+++ trunk/vice/doc/html/plain/BUGS 2008-07-02 17:51:38 UTC (rev 18947)
@@ -1,3 +1,6 @@
+- IRQ acknowledge handling is buggy. Visible in e.g.
+ Charlatan/Beyond Force, Enforcer, Bandits (VIC20).
+
- Xaw UI context popup menu for drive attach is broken if more than
two drives are active.
Modified: trunk/vice/doc/html/plain/NEWS
===================================================================
--- trunk/vice/doc/html/plain/NEWS 2008-07-02 17:44:39 UTC (rev 18946)
+++ trunk/vice/doc/html/plain/NEWS 2008-07-02 17:51:38 UTC (rev 18947)
@@ -41,6 +41,16 @@
- Improved REU compatibility
+- Fixed CPU timing bug introduced in 1.22 (demo "Borderless").
+
+- Fixed bugs in the CIA emulation (demo "So-phisticated",
+ W. Lorenz testsuite).
+
+- Fixed various bugs in VIC-II emulation: Sprite x-positioning,
+ Latch X/Y, video mode changes, DEN bit handling, raster IRQ,
+ NTSC sprites and sprites in full/debugging border mode (list
+ of fixed demos/games too long to mention here).
+
** VIC20 changes
----------------
@@ -87,6 +97,14 @@
- allow for pasting into the VICE window: Either via menu
(Edit/Paste), or by right-clicking on the VICE window.
+- keyboard shortcuts are definable in the configuration file
+ win_shortscuts.vsc
+
+- After a CPU jam user can select to resume emulation without
+ reset.
+
+- Fixed volume slider behaviour when switching fullscreen mode.
+
** BeOS changes
---------------
@@ -120,7 +138,9 @@
- New memmap feature which allows tracking of memory accesses,
activated by the configure option --enable-memmap.
+- Fixed bug in ffmpeg/FFV1 driver. Should be really lossless now.
+
* Changes in VICE 1.22
======================
Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog 2008-07-02 17:44:39 UTC (rev 18946)
+++ trunk/vice/src/ChangeLog 2008-07-02 17:51:38 UTC (rev 18947)
@@ -1,3 +1,11 @@
+2008-07-02 Andreas Matthies <and...@gm...>
+
+ * arch/win32/ui.c: Moved creation of accelerators to
+ ui_init_finish.
+
+ * arch/win32/uikeyboard.c: Log a warning if the shortcut file
+ cannot be opened.
+
2008-07-02 Spiro Trikaliotis <spi...@gm...>
* arch/win32/Makefile.am: Added new file _all.dsp.
Modified: trunk/vice/src/arch/win32/ui.c
===================================================================
--- trunk/vice/src/arch/win32/ui.c 2008-07-02 17:44:39 UTC (rev 18946)
+++ trunk/vice/src/arch/win32/ui.c 2008-07-02 17:51:38 UTC (rev 18947)
@@ -257,8 +257,6 @@
emu_menu = IDR_MENUC64;
}
- ui_accelerator = uikeyboard_create_accelerator_table();
-
/* Register the window class. */
window_class.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
window_class.lpfnWndProc = window_proc;
@@ -324,6 +322,7 @@
/* Initialize the UI after setting all the resource values. */
int ui_init_finish(void)
{
+ ui_accelerator = uikeyboard_create_accelerator_table();
ui_fullscreen_init();
atexit(ui_exit);
return 0;
Modified: trunk/vice/src/arch/win32/uikeyboard.c
===================================================================
--- trunk/vice/src/arch/win32/uikeyboard.c 2008-07-02 17:44:39 UTC (rev 18946)
+++ trunk/vice/src/arch/win32/uikeyboard.c 2008-07-02 17:51:38 UTC (rev 18947)
@@ -48,6 +48,7 @@
#include "intl.h"
#include "keyboard.h"
#include "lib.h"
+#include "log.h"
#include "res.h"
#include "resources.h"
#include "sysfile.h"
@@ -265,8 +266,10 @@
fshortcuts = sysfile_open("win_shortcuts.vsc", &complete_path, MODE_READ_TEXT);
lib_free(complete_path);
- if (fshortcuts == NULL)
+ if (fshortcuts == NULL) {
+ log_error(LOG_DEFAULT, "Warning. Cannot open keyboard shortcut file win_shortcuts.vsc.");
return NULL;
+ }
/* read the shortcut table */
do {
@@ -336,35 +339,6 @@
}
-#if 0
-void uikeyboard_menu_shortcuts(HMENU menu)
-{
- int i;
- MENUITEMINFO mii;
- LPTSTR buf, newbuf;
-
- for (i = 0; idmlist[i].cmd > 0; i++) {
- if (menuitemmodifier[idmlist[i].cmd] != NULL) {
- mii.fMask = MIIM_STRING;
- mii.dwTypeData = NULL;
- mii.cbSize = sizeof(MENUITEMINFO);
- if (GetMenuItemInfo(menu, idmlist[i].cmd, FALSE, &mii)) {
- mii.cch++;
- buf = lib_malloc(mii.cch);
- mii.dwTypeData = buf;
- if (GetMenuItemInfo(menu, idmlist[i].cmd, FALSE, &mii)) {
- newbuf = util_concat(buf, menuitemmodifier[idmlist[i].cmd], NULL);
- mii.dwTypeData = newbuf;
- SetMenuItemInfo(menu, idmlist[i].cmd, FALSE, &mii);
- lib_free(newbuf);
- }
- lib_free(buf);
- }
- }
- }
-}
-#endif
-
/* using MIIM_STRING doesn't work for win9x/winnt4, so trying an older way */
void uikeyboard_menu_shortcuts(HMENU menu)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
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.
|
|
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.
|
19 messages has been excluded from this view by a project administrator.