ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Win32) Test

This commit is contained in:
twinaphex 2016-07-16 17:44:21 +02:00
parent 9fe2ae4a0a
commit 616b9f7471
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gfx/common/win32_common.cpp
View File

@ -50,6 +50,8 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam);
extern "C" bool dinput_handle_message(void *dinput, UINT message, WPARAM wParam, LPARAM lParam); extern "C" bool dinput_handle_message(void *dinput, UINT message, WPARAM wParam, LPARAM lParam);
extern "C" bool doubleclick_on_titlebar;
unsigned g_resize_width; unsigned g_resize_width;
unsigned g_resize_height; unsigned g_resize_height;
bool g_restore_desktop; bool g_restore_desktop;
@ -299,6 +301,11 @@ static LRESULT CALLBACK WndProcCommon(bool *quit, HWND hwnd, UINT message,
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
doubleclick_on_titlebar = false;
if (message == WM_NCLBUTTONDBLCLK)
doubleclick_on_titlebar = true;
switch (message) switch (message)
{ {
case WM_SYSCOMMAND: case WM_SYSCOMMAND:
@ -357,6 +364,11 @@ LRESULT CALLBACK WndProcD3D(HWND hwnd, UINT message,
LRESULT ret; LRESULT ret;
bool quit = false; bool quit = false;
doubleclick_on_titlebar = false;
if (message == WM_NCLBUTTONDBLCLK)
doubleclick_on_titlebar = true;
switch (message) switch (message)
{ {
case WM_DROPFILES: case WM_DROPFILES:
@ -402,6 +414,11 @@ LRESULT CALLBACK WndProcGL(HWND hwnd, UINT message,
bool quit = false; bool quit = false;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
doubleclick_on_titlebar = false;
if (message == WM_NCLBUTTONDBLCLK)
doubleclick_on_titlebar = true;
switch (message) switch (message)
{ {
case WM_DROPFILES: case WM_DROPFILES:

9
input/drivers/dinput.c
View File

@ -181,6 +181,8 @@ static void *dinput_init(void)
return di; return di;
} }
extern bool doubleclick_on_titlebar;
static void dinput_poll(void *data) static void dinput_poll(void *data)
{ {
struct dinput_input *di = (struct dinput_input*)data; struct dinput_input *di = (struct dinput_input*)data;
@ -218,9 +220,10 @@ static void dinput_poll(void *data)
di->mouse_x = di->window_pos_x; di->mouse_x = di->window_pos_x;
di->mouse_y = di->window_pos_y; di->mouse_y = di->window_pos_y;
di->mouse_l = mouse_state.rgbButtons[0]; if (!doubleclick_on_titlebar)
di->mouse_r = mouse_state.rgbButtons[1]; di->mouse_l = mouse_state.rgbButtons[0];
di->mouse_m = mouse_state.rgbButtons[2]; di->mouse_r = mouse_state.rgbButtons[1];
di->mouse_m = mouse_state.rgbButtons[2];
/* No simple way to get absolute coordinates /* No simple way to get absolute coordinates
* for RETRO_DEVICE_POINTER. Just use Win32 APIs. */ * for RETRO_DEVICE_POINTER. Just use Win32 APIs. */