MEGA65: matrix mode minor changes

Allow to use CTRL-TAB to toggle, no need to release CTRL.
Also, using boolean type in some cases.

Author: lgblgblgb

targets/mega65/io_mapper.c

@@ -581,7 +581,7 @@ void io_write ( unsigned int addr, Uint8 data )
 					virtkey(addr - 0x15, data & 0x7F);
 					return;
 				case 0x72:	// "$D672.6 HCPU:MATRIXEN Enable composited Matrix Mode, and disable UART access to serial monitor."
-					matrix_mode_toggle(data & 0x40);
+					matrix_mode_toggle(!!(data & 0x40));
 					return;
 				case 0x7C:					// hypervisor serial monitor port
 					hypervisor_serial_monitor_push_char(data);

targets/mega65/matrix_mode.c

@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 #define DEBUGMATRIX(...)
 
 
-int in_the_matrix = 0;
+bool in_the_matrix = false;
 
 
 // TODO: many inventions here eventlually should be moved into some common place as
@@ -89,7 +89,6 @@ static int chrscreen_xsize, chrscreen_ysize;
 static Uint8 *vmem = NULL, *vmem_prev = NULL, *vmem_backup = NULL;
 static int current_x = 0, current_y = 0;
 static int need_update = 0;
-static int init_done = 0;
 static Uint8 queued_input;
 static unsigned int matrix_counter = 0;
 static int live_update_enabled = 1;
@@ -297,7 +296,7 @@ static void dump_map ( void )
 
 static void cmd_off ( char *p )
 {
-	matrix_mode_toggle(0);
+	matrix_mode_toggle(false);
 }
 
 
@@ -785,7 +784,7 @@ static int kbd_cb_keyevent ( SDL_KeyboardEvent *ev )
 			// Monitor ctrl-tab, as the main handler is defunct at this point, we "hijacked" it!
 			// So we must give up the matrix mode themselves here
 			if (sym == SDLK_TAB && (ev->keysym.mod & (KMOD_LCTRL | KMOD_RCTRL)))
-				matrix_mode_toggle(0);
+				matrix_mode_toggle(false);
 			else
 				queued_input = sym;
 		}
@@ -803,22 +802,22 @@ static int kbd_cb_textevent ( SDL_TextInputEvent *ev )
 }
 
 
-void matrix_mode_toggle ( int status )
+void matrix_mode_toggle ( const bool status )
 {
 	if (!is_osd_enabled()) {
 		ERROR_WINDOW("OSD is not enabled to be able to use Matrix mode.");
 		return;
 	}
-	status = !!status;
-	if (status == !!in_the_matrix)
+	if (status == in_the_matrix)
 		return;
 	in_the_matrix = status;
 	static int saved_allow_mouse_grab;
 	if (in_the_matrix) {
+		static bool init_done = false;
 		D6XX_registers[0x72] |= 0x40;	// be sure we're sync with the matrix bit!
 		osd_hijack(matrix_updater_callback, &backend_xsize, &backend_ysize, &backend_pixels);
 		if (!init_done) {
-			init_done = 1;
+			init_done = true;
 			init_colour_mappings();
 			chrscreen_xsize = backend_xsize / 8;
 			chrscreen_ysize = backend_ysize / 8;
@@ -869,5 +868,10 @@ void matrix_mode_toggle ( int status )
 		hid_register_sdl_textinput_event_callback(HID_CB_LEVEL_CONSOLE, NULL);
 		allow_mouse_grab = saved_allow_mouse_grab;
 	}
-	clear_emu_events();	// cure problems, that triggering/switching-on/off matrix screen cause that ALT key remains latched etc ...
+	// Original intent: cure problems, that triggering/switching-on/off matrix screen cause that ALT key remains latched etc ...
+	// However it breaks the "rapid CTRL-TAB cycling" between matrix/normal mode (without releasing CTRL).
+	// Now it seems, removing this call does not have any notable side-effect besides the original intent, so I try to remove it now.
+#if 0
+	clear_emu_events();
+#endif
 }

targets/mega65/matrix_mode.h

@@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 #ifndef XEMU_MEGA65_MATRIX_MODE_H_INCLUDED
 #define XEMU_MEGA65_MATRIX_MODE_H_INCLUDED
 
-extern int in_the_matrix;
+extern bool in_the_matrix;
 
-extern void matrix_mode_toggle ( int status );
+extern void matrix_mode_toggle ( const bool status );
 
 #endif

targets/mega65/mega65.c

@@ -824,7 +824,7 @@ int main ( int argc, char **argv )
 	emulation_is_running = 1;
 	update_emulated_time_sources();
 	if (configdb.matrixstart)
-		matrix_mode_toggle(1);
+		matrix_mode_toggle(true);
 	// FIXME: for emscripten (anyway it does not work too much currently) there should be 50 or 60 (PAL/NTSC) instead of (fixed, and wrong!) 25!!!!!!
 	XEMU_MAIN_LOOP(emulation_loop, 25, 1);
 	return 0;