From: kub <derkub@gmail.com>
Date: Thu, 27 Feb 2025 22:18:45 +0000 (+0100)
Subject: platform, improve mouse handling
X-Git-Tag: v2.04~38
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44be7e5ceb50ff1bfca64cd9c43423608105af0f;p=picodrive.git

platform, improve mouse handling
---

diff --git a/pico/pico.h b/pico/pico.h
index 16cc6854..e9fc54f0 100644
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -78,6 +78,7 @@ extern void *p32x_bios_g, *p32x_bios_m, *p32x_bios_s;
 #define POPT_EN_FM_DAC      (1<<24) //x00 0000
 #define POPT_EN_FM_FILTER   (1<<25)
 #define POPT_EN_KBD         (1<<26)
+#define POPT_EN_MOUSE       (1<<27)
 
 #define PAHW_MCD    (1<<0)
 #define PAHW_32X    (1<<1)
diff --git a/platform/common/emu.c b/platform/common/emu.c
index 618271e2..75735ea2 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -60,8 +60,10 @@ int pico_inp_mode;
 int flip_after_sync;
 int engineState = PGS_Menu;
 
+int grab_mode;
 int kbd_mode;
 struct vkbd *vkbd;
+int mouse_x, mouse_y;
 
 static int pico_page;
 static int pico_w, pico_h;
@@ -1187,11 +1189,6 @@ void run_events_pico(unsigned int events)
 			emu_status_msg("Input: Pen on Pad");
 		}
 	}
-	if (events & PEV_PICO_PENST) {
-		PicoPicohw.pen_pos[0] ^= 0x8000;
-		PicoPicohw.pen_pos[1] ^= 0x8000;
-		emu_status_msg("Pen %s", PicoPicohw.pen_pos[0] & 0x8000 ? "Up" : "Down");
-	}
 
 	if ((currentConfig.EmuOpt & EOPT_PICO_PEN) &&
 			(PicoIn.pad[0]&0x20) && pico_inp_mode && pico_overlay) {
@@ -1205,15 +1202,9 @@ void run_events_pico(unsigned int events)
 		return;
 
 	/* handle other input modes using the pen */
-	if (currentConfig.input_dev0 == PICO_INPUT_MOUSE ||
-	    currentConfig.input_dev1 == PICO_INPUT_MOUSE) {
+	if (PicoIn.opt & POPT_EN_MOUSE) {
 		pico_pen_x = PicoIn.mouse[0];
 		pico_pen_y = PicoIn.mouse[1];
-		if ((pico_pad ^ PicoIn.pad[0]) & (1<<GBTN_START) & ~pico_pad) {
-			PicoPicohw.pen_pos[0] ^= 0x8000;
-			PicoPicohw.pen_pos[1] ^= 0x8000;
-		}
-		pico_pad = PicoIn.pad[0];
 	} else {
 		if (PicoIn.pad[0] & 1) pico_pen_y--;
 		if (PicoIn.pad[0] & 2) pico_pen_y++;
@@ -1222,6 +1213,13 @@ void run_events_pico(unsigned int events)
 		PicoIn.pad[0] &= ~0x0f; // release UDLR
 	}
 
+	if ((pico_pad ^ PicoIn.pad[0]) & PicoIn.pad[0] & (1<<GBTN_START)) {
+		PicoPicohw.pen_pos[0] ^= 0x8000;
+		PicoPicohw.pen_pos[1] ^= 0x8000;
+		emu_status_msg("Pen %s", PicoPicohw.pen_pos[0] & 0x8000 ? "Up" : "Down");
+	}
+	pico_pad = PicoIn.pad[0];
+
 	/* cursor position, cursor drawing must not cross screen borders */
 	if (pico_pen_y < PICO_PEN_ADJUST_Y)
 		pico_pen_y = PICO_PEN_ADJUST_Y;
@@ -1324,6 +1322,22 @@ static void run_events_ui(unsigned int which)
 	{
 		plat_video_toggle_renderer(1, 0);
 	}
+	if (which & PEV_GRAB_INPUT)
+	{
+		if (PicoIn.opt & POPT_EN_MOUSE) {
+			grab_mode = !grab_mode;
+			in_update_analog(0, 2, &mouse_x);
+			in_update_analog(0, 3, &mouse_y);
+			in_update_analog(0, 0, &mouse_x);
+			in_update_analog(0, 1, &mouse_y);
+			emu_status_msg("Mouse capture %s", grab_mode ? "on" : "off");
+		} else {
+			grab_mode = 0;
+			emu_status_msg("No mouse configured");
+		}
+
+		plat_grab_input(grab_mode);
+	}
 	if (which & PEV_SWITCH_KBD)
 	{
 		if (! (PicoIn.opt & POPT_EN_KBD)) {
@@ -1361,18 +1375,35 @@ void emu_update_input(void)
 	events = actions[IN_BINDTYPE_EMU] & PEV_MASK;
 
 	// update mouse coordinates if there is an emulated mouse
-	if (currentConfig.input_dev0 == PICO_INPUT_MOUSE ||
-	    currentConfig.input_dev1 == PICO_INPUT_MOUSE) {
-		in_update_analog(0, 0, &PicoIn.mouse[0]);
-		in_update_analog(0, 1, &PicoIn.mouse[1]);
-		// scale mouse coordinates from -1024..1024 to 0..screen_w/h
-		PicoIn.mouse[0] = (PicoIn.mouse[0]+1024) * g_screen_width /2048;
-		PicoIn.mouse[1] = (PicoIn.mouse[1]+1024) * g_screen_height/2048;
+	if (PicoIn.opt & POPT_EN_MOUSE) {
+		if (!grab_mode) {
+			in_update_analog(0, 0, &PicoIn.mouse[0]);
+			in_update_analog(0, 1, &PicoIn.mouse[1]);
+			// scale mouse coordinates from -1024..1024 to 0..screen_w/h
+			PicoIn.mouse[0] = (PicoIn.mouse[0]+1024) * g_screen_width /2048;
+			PicoIn.mouse[1] = (PicoIn.mouse[1]+1024) * g_screen_height/2048;
+		} else {
+			int xrel, yrel;
+			in_update_analog(0, 2, &xrel);
+			in_update_analog(0, 3, &yrel);
+			mouse_x += xrel, mouse_y += yrel;
+			// scale mouse coordinates from -1024..1024 to 0..screen_w/h
+			PicoIn.mouse[0] = (mouse_x+1024) * g_screen_width /2048;
+			PicoIn.mouse[1] = (mouse_y+1024) * g_screen_height/2048;
+		}
 
 		in_update_analog(0, -1, &i); // get mouse buttons, bit 2-0 = RML
-		if (i & 1) buttons |= 1<<GBTN_B;
-		if (i & 4) buttons |= 1<<GBTN_C;
-		if (i & 2) buttons |= 1<<GBTN_START;
+		if (PicoIn.AHW & PAHW_PICO) {
+			// TODO is maintaining 2 different mappings necessary?
+			if (i & 1) buttons |= 1<<GBTN_C;        // pen button
+			if (i & 2) buttons |= 1<<GBTN_B;	// red button
+			if (i & 4) buttons |= 1<<GBTN_START;    // pen up/down
+		} else {
+			if (i & 1) buttons |= 1<<GBTN_B;	// as Sega Mouse
+			if (i & 2) buttons |= 1<<GBTN_START;
+			if (i & 4) buttons |= 1<<GBTN_C;
+		}
+
 		if (currentConfig.input_dev0 == PICO_INPUT_MOUSE)
 			pl_actions[0] |= buttons;
 		if (currentConfig.input_dev1 == PICO_INPUT_MOUSE)
@@ -1615,6 +1646,13 @@ static void emu_loop_prep(void)
 	if (((PicoIn.AHW & PAHW_PICO) || (PicoIn.AHW & PAHW_SC)) && currentConfig.keyboard)
 		PicoIn.opt |= POPT_EN_KBD;
 
+	PicoIn.opt &= ~POPT_EN_MOUSE;
+	if (!(PicoIn.AHW & PAHW_8BIT) && (currentConfig.input_dev0 == PICO_INPUT_MOUSE ||
+					currentConfig.input_dev1 == PICO_INPUT_MOUSE)) {
+		PicoIn.opt |= POPT_EN_MOUSE;
+		plat_grab_input(grab_mode);
+	}
+
 	pemu_loop_prep();
 }
 
@@ -1811,4 +1849,5 @@ void emu_loop(void)
 
 	pemu_loop_end();
 	emu_sound_stop();
+	plat_grab_input(0);
 }
diff --git a/platform/common/input_pico.h b/platform/common/input_pico.h
index 369a6fc1..07e26d8c 100644
--- a/platform/common/input_pico.h
+++ b/platform/common/input_pico.h
@@ -29,7 +29,7 @@
 #define PEVB_PICO_PPREV 20
 #define PEVB_PICO_STORY 19
 #define PEVB_PICO_PAD   18
-#define PEVB_PICO_PENST 17
+#define PEVB_GRAB_INPUT 17
 #define PEVB_SWITCH_KBD 16
 #define PEVB_RESET      15
 
@@ -46,7 +46,7 @@
 #define PEV_PICO_PPREV  (1 << PEVB_PICO_PPREV)
 #define PEV_PICO_STORY  (1 << PEVB_PICO_STORY)
 #define PEV_PICO_PAD    (1 << PEVB_PICO_PAD)
-#define PEV_PICO_PENST  (1 << PEVB_PICO_PENST)
+#define PEV_GRAB_INPUT  (1 << PEVB_GRAB_INPUT)
 #define PEV_SWITCH_KBD  (1 << PEVB_SWITCH_KBD)
 #define PEV_RESET       (1 << PEVB_RESET)
 
diff --git a/platform/common/inputmap_kbd.c b/platform/common/inputmap_kbd.c
index 497a5df4..cf5adf57 100644
--- a/platform/common/inputmap_kbd.c
+++ b/platform/common/inputmap_kbd.c
@@ -31,7 +31,7 @@ const struct in_default_bind _in_sdl_defbinds[] = {
 	{ SDLK_F7,     IN_BINDTYPE_EMU, PEVB_PICO_PNEXT },
 	{ SDLK_F8,     IN_BINDTYPE_EMU, PEVB_PICO_STORY },
 	{ SDLK_F9,     IN_BINDTYPE_EMU, PEVB_PICO_PAD },
-	{ SDLK_F10,    IN_BINDTYPE_EMU, PEVB_PICO_PENST },
+	{ SDLK_F10,    IN_BINDTYPE_EMU, PEVB_GRAB_INPUT },
 	{ SDLK_F12,    IN_BINDTYPE_EMU, PEVB_SWITCH_KBD },
 	{ SDLK_BACKSPACE, IN_BINDTYPE_EMU, PEVB_FF },
 
diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index e6ee9a5e..0379e896 100644
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -371,11 +371,11 @@ me_bind_action emuctrl_actions[] =
 	{ "Fast forward   ", PEV_FF },
 	{ "Reset Game     ", PEV_RESET },
 	{ "Enter Menu     ", PEV_MENU },
-	{ "Pico Next page ", PEV_PICO_PNEXT },
 	{ "Pico Prev page ", PEV_PICO_PPREV },
+	{ "Pico Next page ", PEV_PICO_PNEXT },
 	{ "Pico Storyware ", PEV_PICO_STORY },
 	{ "Pico Pad       ", PEV_PICO_PAD },
-	{ "Pico Pen state ", PEV_PICO_PENST },
+	{ "Capture Mouse  ", PEV_GRAB_INPUT },
 	{ "Switch Keyboard", PEV_SWITCH_KBD },
 	{ NULL,                0 }
 };
diff --git a/platform/libpicofe b/platform/libpicofe
index 9e049f36..ce684c88 160000
--- a/platform/libpicofe
+++ b/platform/libpicofe
@@ -1 +1 @@
-Subproject commit 9e049f3601bd101f41016df47d2568b781b50f8e
+Subproject commit ce684c885ecafe0b9279a6c54b97f96e84ece6d3
diff --git a/platform/linux/emu.c b/platform/linux/emu.c
index cb4ce0ae..faa577d3 100644
--- a/platform/linux/emu.c
+++ b/platform/linux/emu.c
@@ -486,8 +486,7 @@ void pemu_loop_prep(void)
 {
 	apply_renderer();
 	plat_video_clear_buffers();
-	plat_show_cursor(currentConfig.input_dev0 != PICO_INPUT_MOUSE &&
-			currentConfig.input_dev1 != PICO_INPUT_MOUSE);
+	plat_show_cursor(!(PicoIn.opt & POPT_EN_MOUSE));
 }
 
 void pemu_loop_end(void)