Trigger matrix mode directly #140

The problem: I've triggered matrix mode with keypress by emitting a
hypervisor trap for that functionality. Which works fine, unless you're
already in hypervisor mode (boot process, trying to debug situation when
stuck there!). In hypervisor mode, surely it's not possible to cause a
trap. Thus my idea, is to control matrix mode directly bypassing the
trap part. Seems to work fine so far ...

targets/mega65/hypervisor.h

@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 #define TRAP_FREEZER_USER_CALL		0x3F
 #define TRAP_RESET			0x40
 #define TRAP_FREEZER_RESTORE_PRESS	0x42
-#define TRAP_ALTTAB			0x43
+#define TRAP_MATRIX			0x43
 
 extern int  in_hypervisor;
 extern int  hickup_is_overriden;

targets/mega65/input_devices.c

@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 #include "xemu/cpu65.h"
 #include "hypervisor.h"
 #include "ui.h"
+#include "matrix_mode.h"
 
 
 #define DEBUGKBD(...)		DEBUG(__VA_ARGS__)
@@ -266,12 +267,20 @@ static void kbd_trigger_alttab_trap ( void )
 	KBD_RELEASE_KEY(TAB_KEY_POS);
 	//KBD_RELEASE_KEY(ALT_KEY_POS);
 	//hwa_kbd.modifiers &= ~MODKEY_ALT;
+	matrix_mode_toggle(!in_the_matrix);
+	// TODO: remove the #if 0 part, if we're sure:
+#if 0
+	// It would trigger matrix-mode via hypervisor call, but it has the problem that
+	// it won't work if you're already in hypervisor mode. So I reverted back to the
+	// direct method above. If it does not cause problem on longer term, let's remove this
+	// section.
 	if (!in_hypervisor) {
-		DEBUGPRINT("KBD: ALT-TAB trap has been triggered." NL);
-		hypervisor_enter(TRAP_ALTTAB);
+		DEBUGPRINT("KBD: MATRIX trap has been triggered." NL);
+		hypervisor_enter(TRAP_MATRIX);
 	} else {
-		DEBUGPRINT("KBD: *IGNORING* ALT-TAB trap trigger, already in hypervisor mode!" NL);
+		DEBUGPRINT("KBD: *IGNORING* MATRIX trap trigger, already in hypervisor mode!" NL);
 	}
+#endif
 }