platform, improve mouse handling

diff --git a/pico/pico.h b/pico/pico.h
index 16cc685..e9fc54f 100644 (file)
--- 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\r
 #define POPT_EN_FM_FILTER   (1<<25)\r
 #define POPT_EN_KBD         (1<<26)\r
+#define POPT_EN_MOUSE       (1<<27)\r
 \r
 #define PAHW_MCD    (1<<0)\r
 #define PAHW_32X    (1<<1)\r

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 618271e..75735ea 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -60,8 +60,10 @@ int pico_inp_mode;
 int flip_after_sync;\r
 int engineState = PGS_Menu;\r
 \r
+int grab_mode;\r
 int kbd_mode;\r
 struct vkbd *vkbd;\r
+int mouse_x, mouse_y;\r
 \r
 static int pico_page;\r
 static int pico_w, pico_h;\r
@@ -1187,11 +1189,6 @@ void run_events_pico(unsigned int events)
                        emu_status_msg("Input: Pen on Pad");\r
                }\r
        }\r
-       if (events & PEV_PICO_PENST) {\r
-               PicoPicohw.pen_pos[0] ^= 0x8000;\r
-               PicoPicohw.pen_pos[1] ^= 0x8000;\r
-               emu_status_msg("Pen %s", PicoPicohw.pen_pos[0] & 0x8000 ? "Up" : "Down");\r
-       }\r
 \r
        if ((currentConfig.EmuOpt & EOPT_PICO_PEN) &&\r
                        (PicoIn.pad[0]&0x20) && pico_inp_mode && pico_overlay) {\r
@@ -1205,15 +1202,9 @@ void run_events_pico(unsigned int events)
                return;\r
 \r
        /* handle other input modes using the pen */\r
-       if (currentConfig.input_dev0 == PICO_INPUT_MOUSE ||\r
-           currentConfig.input_dev1 == PICO_INPUT_MOUSE) {\r
+       if (PicoIn.opt & POPT_EN_MOUSE) {\r
                pico_pen_x = PicoIn.mouse[0];\r
                pico_pen_y = PicoIn.mouse[1];\r
-               if ((pico_pad ^ PicoIn.pad[0]) & (1<<GBTN_START) & ~pico_pad) {\r
-                       PicoPicohw.pen_pos[0] ^= 0x8000;\r
-                       PicoPicohw.pen_pos[1] ^= 0x8000;\r
-               }\r
-               pico_pad = PicoIn.pad[0];\r
        } else {\r
                if (PicoIn.pad[0] & 1) pico_pen_y--;\r
                if (PicoIn.pad[0] & 2) pico_pen_y++;\r
@@ -1222,6 +1213,13 @@ void run_events_pico(unsigned int events)
                PicoIn.pad[0] &= ~0x0f; // release UDLR\r
        }\r
 \r
+       if ((pico_pad ^ PicoIn.pad[0]) & PicoIn.pad[0] & (1<<GBTN_START)) {\r
+               PicoPicohw.pen_pos[0] ^= 0x8000;\r
+               PicoPicohw.pen_pos[1] ^= 0x8000;\r
+               emu_status_msg("Pen %s", PicoPicohw.pen_pos[0] & 0x8000 ? "Up" : "Down");\r
+       }\r
+       pico_pad = PicoIn.pad[0];\r
+\r
        /* cursor position, cursor drawing must not cross screen borders */\r
        if (pico_pen_y < PICO_PEN_ADJUST_Y)\r
                pico_pen_y = PICO_PEN_ADJUST_Y;\r
@@ -1324,6 +1322,22 @@ static void run_events_ui(unsigned int which)
        {\r
                plat_video_toggle_renderer(1, 0);\r
        }\r
+       if (which & PEV_GRAB_INPUT)\r
+       {\r
+               if (PicoIn.opt & POPT_EN_MOUSE) {\r
+                       grab_mode = !grab_mode;\r
+                       in_update_analog(0, 2, &mouse_x);\r
+                       in_update_analog(0, 3, &mouse_y);\r
+                       in_update_analog(0, 0, &mouse_x);\r
+                       in_update_analog(0, 1, &mouse_y);\r
+                       emu_status_msg("Mouse capture %s", grab_mode ? "on" : "off");\r
+               } else {\r
+                       grab_mode = 0;\r
+                       emu_status_msg("No mouse configured");\r
+               }\r
+\r
+               plat_grab_input(grab_mode);\r
+       }\r
        if (which & PEV_SWITCH_KBD)\r
        {\r
                if (! (PicoIn.opt & POPT_EN_KBD)) {\r
@@ -1361,18 +1375,35 @@ void emu_update_input(void)
        events = actions[IN_BINDTYPE_EMU] & PEV_MASK;\r
 \r
        // update mouse coordinates if there is an emulated mouse\r
-       if (currentConfig.input_dev0 == PICO_INPUT_MOUSE ||\r
-           currentConfig.input_dev1 == PICO_INPUT_MOUSE) {\r
-               in_update_analog(0, 0, &PicoIn.mouse[0]);\r
-               in_update_analog(0, 1, &PicoIn.mouse[1]);\r
-               // scale mouse coordinates from -1024..1024 to 0..screen_w/h\r
-               PicoIn.mouse[0] = (PicoIn.mouse[0]+1024) * g_screen_width /2048;\r
-               PicoIn.mouse[1] = (PicoIn.mouse[1]+1024) * g_screen_height/2048;\r
+       if (PicoIn.opt & POPT_EN_MOUSE) {\r
+               if (!grab_mode) {\r
+                       in_update_analog(0, 0, &PicoIn.mouse[0]);\r
+                       in_update_analog(0, 1, &PicoIn.mouse[1]);\r
+                       // scale mouse coordinates from -1024..1024 to 0..screen_w/h\r
+                       PicoIn.mouse[0] = (PicoIn.mouse[0]+1024) * g_screen_width /2048;\r
+                       PicoIn.mouse[1] = (PicoIn.mouse[1]+1024) * g_screen_height/2048;\r
+               } else {\r
+                       int xrel, yrel;\r
+                       in_update_analog(0, 2, &xrel);\r
+                       in_update_analog(0, 3, &yrel);\r
+                       mouse_x += xrel, mouse_y += yrel;\r
+                       // scale mouse coordinates from -1024..1024 to 0..screen_w/h\r
+                       PicoIn.mouse[0] = (mouse_x+1024) * g_screen_width /2048;\r
+                       PicoIn.mouse[1] = (mouse_y+1024) * g_screen_height/2048;\r
+               }\r
 \r
                in_update_analog(0, -1, &i); // get mouse buttons, bit 2-0 = RML\r
-               if (i & 1) buttons |= 1<<GBTN_B;\r
-               if (i & 4) buttons |= 1<<GBTN_C;\r
-               if (i & 2) buttons |= 1<<GBTN_START;\r
+               if (PicoIn.AHW & PAHW_PICO) {\r
+                       // TODO is maintaining 2 different mappings necessary?\r
+                       if (i & 1) buttons |= 1<<GBTN_C;        // pen button\r
+                       if (i & 2) buttons |= 1<<GBTN_B;        // red button\r
+                       if (i & 4) buttons |= 1<<GBTN_START;    // pen up/down\r
+               } else {\r
+                       if (i & 1) buttons |= 1<<GBTN_B;        // as Sega Mouse\r
+                       if (i & 2) buttons |= 1<<GBTN_START;\r
+                       if (i & 4) buttons |= 1<<GBTN_C;\r
+               }\r
+\r
                if (currentConfig.input_dev0 == PICO_INPUT_MOUSE)\r
                        pl_actions[0] |= buttons;\r
                if (currentConfig.input_dev1 == PICO_INPUT_MOUSE)\r
@@ -1615,6 +1646,13 @@ static void emu_loop_prep(void)
        if (((PicoIn.AHW & PAHW_PICO) || (PicoIn.AHW & PAHW_SC)) && currentConfig.keyboard)\r
                PicoIn.opt |= POPT_EN_KBD;\r
 \r
+       PicoIn.opt &= ~POPT_EN_MOUSE;\r
+       if (!(PicoIn.AHW & PAHW_8BIT) && (currentConfig.input_dev0 == PICO_INPUT_MOUSE ||\r
+                                       currentConfig.input_dev1 == PICO_INPUT_MOUSE)) {\r
+               PicoIn.opt |= POPT_EN_MOUSE;\r
+               plat_grab_input(grab_mode);\r
+       }\r
+\r
        pemu_loop_prep();\r
 }\r
 \r
@@ -1811,4 +1849,5 @@ void emu_loop(void)
 \r
        pemu_loop_end();\r
        emu_sound_stop();\r
+       plat_grab_input(0);\r
 }\r

diff --git a/platform/common/input_pico.h b/platform/common/input_pico.h
index 369a6fc..07e26d8 100644 (file)
--- 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 497a5df..cf5adf5 100644 (file)
--- 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 e6ee9a5..0379e89 100644 (file)
--- 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 9e049f3..ce684c8 160000 (submodule)
--- 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 cb4ce0a..faa577d 100644 (file)
--- a/platform/linux/emu.c
+++ b/platform/linux/emu.c
@@ -486,8 +486,7 @@ void pemu_loop_prep(void)
 {\r
        apply_renderer();\r
        plat_video_clear_buffers();\r
-       plat_show_cursor(currentConfig.input_dev0 != PICO_INPUT_MOUSE &&\r
-                       currentConfig.input_dev1 != PICO_INPUT_MOUSE);\r
+       plat_show_cursor(!(PicoIn.opt & POPT_EN_MOUSE));\r
 }\r
 \r
 void pemu_loop_end(void)\r