platform, fix no mouse handling for systems without WM

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 75735ea..8e6ad54 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -1336,7 +1336,7 @@ static void run_events_ui(unsigned int which)
                        emu_status_msg("No mouse configured");\r
                }\r
 \r
-               plat_grab_input(grab_mode);\r
+               plat_grab_cursor(grab_mode);\r
        }\r
        if (which & PEV_SWITCH_KBD)\r
        {\r
@@ -1650,7 +1650,7 @@ static void emu_loop_prep(void)
        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
+               plat_grab_cursor(grab_mode);\r
        }\r
 \r
        pemu_loop_prep();\r
@@ -1849,5 +1849,5 @@ void emu_loop(void)
 \r
        pemu_loop_end();\r
        emu_sound_stop();\r
-       plat_grab_input(0);\r
+       plat_grab_cursor(0);\r
 }\r

diff --git a/platform/common/emu.h b/platform/common/emu.h
index 8c4f733..4255e37 100644 (file)
--- a/platform/common/emu.h
+++ b/platform/common/emu.h
@@ -194,7 +194,8 @@ void plat_init(void);
 void plat_finish(void);
 
 void plat_show_cursor(int on);
-void plat_grab_input(int on);
+int plat_grab_cursor(int on);
+int plat_has_wm(void);
 
 /* used before things blocking for a while (these funcs redraw on return) */
 void plat_status_msg_busy_first(const char *msg);

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index 0379e89..69bf60d 100644 (file)
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -375,13 +375,15 @@ me_bind_action emuctrl_actions[] =
        { "Pico Next page ", PEV_PICO_PNEXT },
        { "Pico Storyware ", PEV_PICO_STORY },
        { "Pico Pad       ", PEV_PICO_PAD },
-       { "Capture Mouse  ", PEV_GRAB_INPUT },
        { "Switch Keyboard", PEV_SWITCH_KBD },
+       { "Capture Mouse  ", PEV_GRAB_INPUT },
        { NULL,                0 }
 };
 
 static int key_config_loop_wrap(int id, int keys)
 {
+       int n;
+
        switch (id) {
                case MA_CTRL_PLAYER1:
                        key_config_loop(me_ctrl_actions, array_size(me_ctrl_actions) - 1, 0);
@@ -396,7 +398,8 @@ static int key_config_loop_wrap(int id, int keys)
                        key_config_loop(me_ctrl_actions, array_size(me_ctrl_actions) - 1, 3);
                        break;
                case MA_CTRL_EMU:
-                       key_config_loop(emuctrl_actions, array_size(emuctrl_actions) - 1, -1);
+                       n = (plat_has_wm() ? 1 : 2);
+                       key_config_loop(emuctrl_actions, array_size(emuctrl_actions) - n, -1);
                        break;
                default:
                        break;

diff --git a/platform/common/plat_sdl.c b/platform/common/plat_sdl.c
index 5a484fc..4f8249f 100644 (file)
--- a/platform/common/plat_sdl.c
+++ b/platform/common/plat_sdl.c
@@ -459,9 +459,15 @@ void plat_show_cursor(int on)
        SDL_ShowCursor(on && !hide_cursor);
 }
 
-void plat_grab_input(int on)
+int plat_grab_cursor(int on)
 {
        SDL_WM_GrabInput(on ? SDL_GRAB_ON : SDL_GRAB_OFF);
+       return on;
+}
+
+int plat_has_wm(void)
+{
+       return plat_sdl_is_windowed();
 }
 
 static void plat_sdl_resize(int w, int h)

diff --git a/platform/gp2x/plat.c b/platform/gp2x/plat.c
index 422b4dd..b7096b7 100644 (file)
--- a/platform/gp2x/plat.c
+++ b/platform/gp2x/plat.c
@@ -184,6 +184,20 @@ void plat_video_menu_leave(void)
 {
 }
 
+void plat_show_cursor(int on)
+{
+}
+
+int plat_grab_cursor(int on)
+{
+       return 0;
+}
+
+int plat_has_wm(void)
+{
+       return 0;
+}
+
 void *plat_mem_get_for_drc(size_t size)
 {
        return NULL;

diff --git a/platform/pandora/plat.c b/platform/pandora/plat.c
index b9a91d3..eb326ee 100644 (file)
--- a/platform/pandora/plat.c
+++ b/platform/pandora/plat.c
@@ -78,7 +78,6 @@ static struct in_default_bind in_evdev_defbinds[] =
        { KEY_6,        IN_BINDTYPE_EMU, PEVB_PICO_PNEXT },\r
        { KEY_7,        IN_BINDTYPE_EMU, PEVB_PICO_STORY },\r
        { KEY_8,        IN_BINDTYPE_EMU, PEVB_PICO_PAD },\r
-       { KEY_9,        IN_BINDTYPE_EMU, PEVB_PICO_PENST },\r
        { 0, 0, 0 }\r
 };\r
 \r
@@ -455,6 +454,20 @@ void plat_video_loop_prepare(void)
        // emu_video_mode_change will call pnd_setup_layer()\r
 }\r
 \r
+void plat_show_cursor(int on)\r
+{\r
+}\r
+\r
+int plat_grab_cursor(int on)\r
+{\r
+       return 0;\r
+}\r
+\r
+int plat_has_wm(void)\r
+{\r
+       return 0;\r
+}\r
+\r
 void pemu_loop_prep(void)\r
 {\r
        // dirty buffers better go now than during gameplay\r

diff --git a/platform/ps2/emu.c b/platform/ps2/emu.c
index 03153ac..b3379cb 100644 (file)
--- a/platform/ps2/emu.c
+++ b/platform/ps2/emu.c
@@ -1072,6 +1072,20 @@ void plat_video_loop_prepare(void)
        vidResetMode();
 }
 
+void plat_show_cursor(int on)
+{
+}
+
+int plat_grab_cursor(int on)
+{
+       return 0;
+}
+
+int plat_has_wm(void)
+{
+       return 0;
+}
+
 /* prepare for entering the emulator loop */
 void pemu_loop_prep(void)
 {

diff --git a/platform/psp/plat.c b/platform/psp/plat.c
index 8381770..0f14b33 100644 (file)
--- a/platform/psp/plat.c
+++ b/platform/psp/plat.c
@@ -129,6 +129,20 @@ void plat_video_menu_leave(void)
        plat_video_set_buffer(g_screen_ptr);
 }
 
+void plat_show_cursor(int on)
+{
+}
+
+int plat_grab_cursor(int on)
+{
+       return 0;
+}
+
+int plat_has_wm(void)
+{
+       return 0;
+}
+
 /* check arg at index x */
 int plat_parse_arg(int argc, char *argv[], int *x)
 {