new: option to disable menu color scheme

Author: iss

ChangeLog.txt

@@ -3,6 +3,7 @@ Oricutron ChangeLog
 
 pre-release changes (work in progress)
 --------------------------------------
+* Added option to disable menu color scheme
 * Updated BD500 support
 * Fixed crash with visual keyboard on/off
 * Added Byte Drive BD-500 support

gui.c

@@ -283,7 +283,7 @@ struct osdmenuitem hwopitems[] = { { " Oric-1",                "1",    SDLK_1,
                                    { " Lightpen",              NULL,   0,        togglelightpen,  0, 0 },
                                    { " Serial none          ", NULL,   0,        toggleaciabackend, 0, 0 },
                                    { " CH376 (Telestrat)    ", NULL,   0,        togglech376, 0, 0 },
-                                   { " Twilighte board    ", NULL,   0,        toggletwilighte, 0, 0 },                                   
+                                   { " Twilighte board    ", NULL,   0,        toggletwilighte, 0, 0 },
 //                                   { " Mouse",                 NULL,   0,        NULL,            0, 0 },
                                    { OSDMENUBAR,               NULL,   0,        NULL,            0, 0 },
                                    { "Back",                   "\x17", SDLK_BACKSPACE,gotomenu,   0, 0 },
@@ -1541,16 +1541,16 @@ void toggletwilighte(struct machine *oric, struct osdmenuitem *mitem, int dummy)
 	oric->twilighteboard_activated = SDL_TRUE;
 	mitem->name = "\x0e""Twilighte board";
 	oric->twilighte = twilighte_oric_init();
-	if (oric->twilighte == NULL) 
+	if (oric->twilighte == NULL)
   {
      oric->twilighteboard_activated = SDL_FALSE; // Impossible to create struct, we did not activate twilighteboard
   }
   else
   {
     oric->ch376_activated = SDL_TRUE;
   }
-  
-		
+
+
 }
 
 // Toggle symbols autoload
@@ -2374,6 +2374,8 @@ void setmenutoggles( struct machine *oric )
   else
      find_item_by_function(keopitems, togglestickykeys)->name = " Sticky mod keys";
 
+  g_menu_scheme = oric->disable_menuscheme? 5 : oric->type;
+
   find_item_by_function(hwopitems, togglech376)->name = oric->ch376_activated ? "\x0e""CH376 (Telestrat)" : " CH376 (Telestrat)    ";
   find_item_by_function(hwopitems, toggletwilighte)->name = oric->twilighteboard_activated ? "\x0e""Twilighte board" : " Twilighte board";
 }

machine.c

@@ -62,7 +62,6 @@ extern char diskpath[], diskfile[], filetmp[];
 extern char telediskpath[], telediskfile[];
 extern char pravdiskpath[], pravdiskfile[];
 extern SDL_bool refreshstatus, refreshavi;
-extern int g_menu_scheme; // #InfoBadDesign - init g_menu_scheme should be done elsewhere - machine.c should not depend on gui - but this is the only place I know
 
 char atmosromfile[1024];
 char oric1romfile[1024];
@@ -319,8 +318,8 @@ void atmoswrite( struct m6502 *cpu, unsigned short addr, unsigned char data )
   if (oric->twilighteboard_activated &&  addr >= 0xc000  ) 
     twilighteboard_oric_ROM_RAM_write(oric->twilighte,addr-0xc000,data);
   else
-    if( ( !oric->romdis ) && ( addr >= 0xc000 ) ) return;  // Can't write to ROM!
-  
+  if( ( !oric->romdis ) && ( addr >= 0xc000 ) ) return;  // Can't write to ROM!
+
   if( ( addr & 0xff00 ) == 0x0300 )
   {
     if( oric->aciabackend && ( oric->aciaoffset <= addr && addr < oric->aciaoffset+4 ) )
@@ -1192,6 +1191,8 @@ void preinit_machine( struct machine *oric )
   oric->define_mapping = SDL_FALSE;
   oric->sticky_mod_keys = SDL_FALSE;
 
+  oric->disable_menuscheme = SDL_FALSE;
+
   oric->pravdiskautoboot = SDL_TRUE;
 }
 
@@ -1810,8 +1811,6 @@ SDL_bool init_machine( struct machine *oric, int type, SDL_bool nukebreakpoints
 
   clear_patches( oric );
 
-  g_menu_scheme = type;
-
   switch( type )
   {
     case MACH_ORIC1_16K:

machine.h

@@ -260,6 +260,8 @@ struct machine
   SDL_bool define_mapping;
   SDL_bool sticky_mod_keys;
 
+  SDL_bool disable_menuscheme;
+
   int aciaoffset;
   int aciabackend;
   int aciabackendcfg;

main.c

@@ -528,6 +528,7 @@ static void load_config( struct start_opts *sto, struct machine *oric )
     if( read_config_bool(   &sto->lctmp[i], "ch376",        &oric->ch376_activated) ) continue;
     if( read_config_bool(   &sto->lctmp[i], "twilighte_board",&oric->twilighteboard_activated) ) continue;
     if( read_config_bool(   &sto->lctmp[i], "pravdiskautoboot", &oric->pravdiskautoboot ) ) continue;
+    if( read_config_bool(   &sto->lctmp[i], "disable_menuscheme", &oric->disable_menuscheme ) ) continue;
     if( read_config_bool(   &sto->lctmp[i], "show_keyboard", &oric->show_keyboard ) ) continue;
     if( read_config_bool(   &sto->lctmp[i], "sticky_mod_keys", &oric->sticky_mod_keys ) )continue;
     if( read_config_string( &sto->lctmp[i], "autoload_keyboard_mapping", keymap_file, 4096 ) )
@@ -1397,7 +1398,7 @@ void frameloop_normal( struct machine *oric, SDL_bool *framedone, SDL_bool *need
       }
 
       if (!oric->twilighteboard_activated)
-        tape_patches( oric );
+      tape_patches( oric );
 
       via_clock( &oric->via, oric->cpu.icycles );
       ay_ticktock( &oric->ay, oric->cpu.icycles );

oricutron.cfg

@@ -204,10 +204,13 @@ kbjoy2_fire2 = 'N'
 kbjoy2_fire3 = 'LALT'
 
 ; Visual keyboard
-show_keyboard = yes
+;show_keyboard = yes
 ;sticky_mod_keys = yes
 ;autoload_keyboard_mapping = 'keymap/my_keymap.kma'
 
+; Disable menu color scheme
+;disable_menuscheme = no
+
 ; ch376 chip emulation. This chip can read a usbkey. For more information : http://orix.oric.org
 ; only available in telestrat mode
 ch376 = no

oricutron.desktop

@@ -10,4 +10,4 @@ Exec=oricutron %U
 MimeType=application/x-oric-rom;application/x-oric-tape;application/x-oric-disk
 Icon=oricutron
 Categories=Emulator;Utility;
-Keywords=ORIC,Oric1,Atmos
+Keywords=ORIC,Oric1,Atmos,Pravetz-8D

roms/basic11b.sym

@@ -10,6 +10,7 @@ c4d3 InsDelLine
 c4e0 DeleteLine
 c524 InsertLine
 c55f SetLineLinkPtrs
+c444 FreeMemCheck
 c592 GetLine
 c5e8 ReadKey
 c5fa TokeniseLine
@@ -167,6 +168,7 @@ ede0 SetupTimer
 ee1a StopTimer
 ee22 IRQ
 ee8c ResetTimer
+ee1a StopTimer
 ee9d GetTimer
 eeab SetTimer
 eec9 Delay
@@ -213,6 +215,7 @@ fb14 KeyClickH
 fb1c KeyClickHData
 fb2a KeyClickL
 fb32 KeyClickLData
+fb14 KeyClickH
 fb40 SOUND
 fbd0 PLAY
 fc18 MUSIC

roms/pravetzt-1.0.pch

@@ -0,0 +1,74 @@
+;
+; ROM patches file
+;
+; This file describes how to patch a ROM for things like turbotape,
+; and filename decoding.
+;
+
+; ****** ROM INFORMATION ******
+
+; This part isn't actual patches, just information about
+; the hardware the ROM expects to be present.
+
+; ROM expects a special keyboard layout?
+keymap = qwerty
+
+; ****** FILENAME DECODING *******
+
+; When the PC is about to execute this address, we should be at a point
+; in CLOAD/CSAVE/STORE/RECALL where the filename is valid in memory.
+fd_cload_getname_pc = $e4af
+fd_csave_getname_pc = $e7ef
+;fd_store_getname_pc =
+;fd_recall_getname_pc =
+
+; The address to read the CLOAD filename
+fd_getname_addr = $0035
+
+
+; ****** TURBOTAPE ******
+
+; Address of the "Cassette Sync" function in ROM
+tt_getsync_pc = $e696
+
+; Address of the RTS at the end of the cassette sync function (so we can
+; skip the function)
+tt_getsync_end_pc = $e6b9
+
+; If turbotape is enabled, but no tape is inserted, the cassette sync
+; function will be executed normally. Here we have an address inside the
+; loop that waits for the cassette sync signal, so that we can break out
+; of it if a tape is inserted.
+tt_getsync_loop_pc = $e681
+
+; Address of the "Read Byte" function in ROM
+tt_readbyte_pc = $e630
+
+; Address of the RTS at the end of the read byte function
+tt_readbyte_end_pc = $e65b
+
+; Set carry at end of readbyte routine?
+tt_readbyte_setcarry = no
+
+; In order to simulate the effects of the read byte routine, you can
+; specify an address to write the byte read, and an address to write
+; zero to.
+tt_readbyte_storebyte_addr = $002f
+;tt_readbyte_storezero_addr =
+
+; Address of the "put byte" function in ROM
+tt_putbyte_pc = $e5c6
+
+; Address of the RTS at the end of the put byte function
+tt_putbyte_end_pc = $e5f2
+
+; Address of the RTS at the end of CSAVE
+tt_csave_end_pc = $e7fe
+
+; Address of the RTS at the end of STORE
+;tt_store_end_pc =
+
+; Address of the function that writes the tape leader
+; (so we can write a shorter one)
+tt_writeleader_pc = $e6ba
+tt_writeleader_end_pc = $e6c9