Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-20 22:16:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added a hint to disable window frame and title bar interaction when the cursor is hidden

Browse Source
This commit is contained in:
Sam Lantinga 2014-06-04 10:50:32 -07:00
parent d34184461f
commit 0d1f0fed71
4 changed files with 88 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/SDL_hints.h
View File

@ -185,6 +185,17 @@ extern "C" {
*/ */
#define SDL_HINT_VIDEO_X11_XRANDR "SDL_VIDEO_X11_XRANDR" #define SDL_HINT_VIDEO_X11_XRANDR "SDL_VIDEO_X11_XRANDR"
/**
* \brief A variable controlling whether the window frame and title bar are interactive when the cursor is hidden
*
* This variable can be set to the following values:
* "0" - The window frame is not interactive when the cursor is hidden (no move, resize, etc)
* "1" - The window frame is interactive when the cursor is hidden
*
* By default SDL will allow interaction with the window frame when the cursor is hidden
*/
#define SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN "SDL_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN"
/** /**
* \brief A variable controlling whether grabbing input grabs the keyboard * \brief A variable controlling whether grabbing input grabs the keyboard
* *

130
src/video/windows/SDL_windowsevents.c
View File

@ -76,17 +76,15 @@
#endif #endif
static SDL_Scancode static SDL_Scancode
WindowsScanCodeToSDLScanCode( LPARAM lParam, WPARAM wParam ) WindowsScanCodeToSDLScanCode(LPARAM lParam, WPARAM wParam)
{ {
SDL_Scancode code; SDL_Scancode code;
char bIsExtended; char bIsExtended;
int nScanCode = ( lParam >> 16 ) & 0xFF; int nScanCode = (lParam >> 16) & 0xFF;
/* 0x45 here to work around both pause and numlock sharing the same scancode, so use the VK key to tell them apart */ /* 0x45 here to work around both pause and numlock sharing the same scancode, so use the VK key to tell them apart */
if ( nScanCode == 0 || nScanCode == 0x45 ) if (nScanCode == 0 || nScanCode == 0x45) {
{ switch(wParam) {
switch( wParam )
{
case VK_CLEAR: return SDL_SCANCODE_CLEAR; case VK_CLEAR: return SDL_SCANCODE_CLEAR;
case VK_MODECHANGE: return SDL_SCANCODE_MODE; case VK_MODECHANGE: return SDL_SCANCODE_MODE;
case VK_SELECT: return SDL_SCANCODE_SELECT; case VK_SELECT: return SDL_SCANCODE_SELECT;
@ -141,16 +139,14 @@ WindowsScanCodeToSDLScanCode( LPARAM lParam, WPARAM wParam )
} }
} }
if ( nScanCode > 127 ) if (nScanCode > 127)
return SDL_SCANCODE_UNKNOWN; return SDL_SCANCODE_UNKNOWN;
code = windows_scancode_table[nScanCode]; code = windows_scancode_table[nScanCode];
bIsExtended = ( lParam & ( 1 << 24 ) ) != 0; bIsExtended = (lParam & (1 << 24)) != 0;
if ( !bIsExtended ) if (!bIsExtended) {
{ switch (code) {
switch ( code )
{
case SDL_SCANCODE_HOME: case SDL_SCANCODE_HOME:
return SDL_SCANCODE_KP_7; return SDL_SCANCODE_KP_7;
case SDL_SCANCODE_UP: case SDL_SCANCODE_UP:
@ -176,11 +172,8 @@ WindowsScanCodeToSDLScanCode( LPARAM lParam, WPARAM wParam )
default: default:
break; break;
} }
} } else {
else switch (code) {
{
switch ( code )
{
case SDL_SCANCODE_RETURN: case SDL_SCANCODE_RETURN:
return SDL_SCANCODE_KP_ENTER; return SDL_SCANCODE_KP_ENTER;
case SDL_SCANCODE_LALT: case SDL_SCANCODE_LALT:
@ -201,14 +194,11 @@ WindowsScanCodeToSDLScanCode( LPARAM lParam, WPARAM wParam )
void void
WIN_CheckWParamMouseButton( SDL_bool bwParamMousePressed, SDL_bool bSDLMousePressed, SDL_WindowData *data, Uint8 button ) WIN_CheckWParamMouseButton(SDL_bool bwParamMousePressed, SDL_bool bSDLMousePressed, SDL_WindowData *data, Uint8 button)
{ {
if ( bwParamMousePressed && !bSDLMousePressed ) if (bwParamMousePressed && !bSDLMousePressed) {
{
SDL_SendMouseButton(data->window, 0, SDL_PRESSED, button); SDL_SendMouseButton(data->window, 0, SDL_PRESSED, button);
} } else if (!bwParamMousePressed && bSDLMousePressed) {
else if ( !bwParamMousePressed && bSDLMousePressed )
{
SDL_SendMouseButton(data->window, 0, SDL_RELEASED, button); SDL_SendMouseButton(data->window, 0, SDL_RELEASED, button);
} }
} }
@ -218,53 +208,51 @@ WIN_CheckWParamMouseButton( SDL_bool bwParamMousePressed, SDL_bool bSDLMousePres
* so this funciton reconciles our view of the world with the current buttons reported by windows * so this funciton reconciles our view of the world with the current buttons reported by windows
*/ */
void void
WIN_CheckWParamMouseButtons( WPARAM wParam, SDL_WindowData *data ) WIN_CheckWParamMouseButtons(WPARAM wParam, SDL_WindowData *data)
{ {
if ( wParam != data->mouse_button_flags ) if (wParam != data->mouse_button_flags) {
{ Uint32 mouseFlags = SDL_GetMouseState(NULL, NULL);
Uint32 mouseFlags = SDL_GetMouseState( NULL, NULL ); WIN_CheckWParamMouseButton((wParam & MK_LBUTTON), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT);
WIN_CheckWParamMouseButton( (wParam & MK_LBUTTON), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT ); WIN_CheckWParamMouseButton((wParam & MK_MBUTTON), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE);
WIN_CheckWParamMouseButton( (wParam & MK_MBUTTON), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE ); WIN_CheckWParamMouseButton((wParam & MK_RBUTTON), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT);
WIN_CheckWParamMouseButton( (wParam & MK_RBUTTON), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT ); WIN_CheckWParamMouseButton((wParam & MK_XBUTTON1), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1);
WIN_CheckWParamMouseButton( (wParam & MK_XBUTTON1), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1 ); WIN_CheckWParamMouseButton((wParam & MK_XBUTTON2), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2);
WIN_CheckWParamMouseButton( (wParam & MK_XBUTTON2), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2 );
data->mouse_button_flags = wParam; data->mouse_button_flags = wParam;
} }
} }
void void
WIN_CheckRawMouseButtons( ULONG rawButtons, SDL_WindowData *data ) WIN_CheckRawMouseButtons(ULONG rawButtons, SDL_WindowData *data)
{ {
if ( rawButtons != data->mouse_button_flags ) if (rawButtons != data->mouse_button_flags) {
{ Uint32 mouseFlags = SDL_GetMouseState(NULL, NULL);
Uint32 mouseFlags = SDL_GetMouseState( NULL, NULL ); if ((rawButtons & RI_MOUSE_BUTTON_1_DOWN))
if ( (rawButtons & RI_MOUSE_BUTTON_1_DOWN) ) WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_1_DOWN), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT);
WIN_CheckWParamMouseButton( (rawButtons & RI_MOUSE_BUTTON_1_DOWN), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT ); if ((rawButtons & RI_MOUSE_BUTTON_1_UP))
if ( (rawButtons & RI_MOUSE_BUTTON_1_UP) ) WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_1_UP), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT);
WIN_CheckWParamMouseButton( !(rawButtons & RI_MOUSE_BUTTON_1_UP), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT ); if ((rawButtons & RI_MOUSE_BUTTON_2_DOWN))
if ( (rawButtons & RI_MOUSE_BUTTON_2_DOWN) ) WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_2_DOWN), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT);
WIN_CheckWParamMouseButton( (rawButtons & RI_MOUSE_BUTTON_2_DOWN), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT ); if ((rawButtons & RI_MOUSE_BUTTON_2_UP))
if ( (rawButtons & RI_MOUSE_BUTTON_2_UP) ) WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_2_UP), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT);
WIN_CheckWParamMouseButton( !(rawButtons & RI_MOUSE_BUTTON_2_UP), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT ); if ((rawButtons & RI_MOUSE_BUTTON_3_DOWN))
if ( (rawButtons & RI_MOUSE_BUTTON_3_DOWN) ) WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_3_DOWN), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE);
WIN_CheckWParamMouseButton( (rawButtons & RI_MOUSE_BUTTON_3_DOWN), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE ); if ((rawButtons & RI_MOUSE_BUTTON_3_UP))
if ( (rawButtons & RI_MOUSE_BUTTON_3_UP) ) WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_3_UP), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE);
WIN_CheckWParamMouseButton( !(rawButtons & RI_MOUSE_BUTTON_3_UP), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE ); if ((rawButtons & RI_MOUSE_BUTTON_4_DOWN))
if ( (rawButtons & RI_MOUSE_BUTTON_4_DOWN) ) WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_4_DOWN), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1);
WIN_CheckWParamMouseButton( (rawButtons & RI_MOUSE_BUTTON_4_DOWN), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1 ); if ((rawButtons & RI_MOUSE_BUTTON_4_UP))
if ( (rawButtons & RI_MOUSE_BUTTON_4_UP) ) WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_4_UP), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1);
WIN_CheckWParamMouseButton( !(rawButtons & RI_MOUSE_BUTTON_4_UP), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1 ); if ((rawButtons & RI_MOUSE_BUTTON_5_DOWN))
if ( (rawButtons & RI_MOUSE_BUTTON_5_DOWN) ) WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_5_DOWN), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2);
WIN_CheckWParamMouseButton( (rawButtons & RI_MOUSE_BUTTON_5_DOWN), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2 ); if ((rawButtons & RI_MOUSE_BUTTON_5_UP))
if ( (rawButtons & RI_MOUSE_BUTTON_5_UP) ) WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_5_UP), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2);
WIN_CheckWParamMouseButton( !(rawButtons & RI_MOUSE_BUTTON_5_UP), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2 );
data->mouse_button_flags = rawButtons; data->mouse_button_flags = rawButtons;
} }
} }
void void
WIN_CheckAsyncMouseRelease( SDL_WindowData *data ) WIN_CheckAsyncMouseRelease(SDL_WindowData *data)
{ {
Uint32 mouseFlags; Uint32 mouseFlags;
SHORT keyState; SHORT keyState;
@ -272,9 +260,9 @@ WIN_CheckAsyncMouseRelease( SDL_WindowData *data )
/* mouse buttons may have changed state here, we need to resync them, /* mouse buttons may have changed state here, we need to resync them,
but we will get a WM_MOUSEMOVE right away which will fix things up if in non raw mode also but we will get a WM_MOUSEMOVE right away which will fix things up if in non raw mode also
*/ */
mouseFlags = SDL_GetMouseState( NULL, NULL ); mouseFlags = SDL_GetMouseState(NULL, NULL);
keyState = GetAsyncKeyState( VK_LBUTTON ); keyState = GetAsyncKeyState(VK_LBUTTON);
if (!(keyState & 0x8000)) { if (!(keyState & 0x8000)) {
WIN_CheckWParamMouseButton(SDL_FALSE, (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT); WIN_CheckWParamMouseButton(SDL_FALSE, (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT);
} }
@ -465,12 +453,12 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
initialMousePoint.y = mouse->lLastY; initialMousePoint.y = mouse->lLastY;
} }
SDL_SendMouseMotion(data->window, 0, 1, (int)(mouse->lLastX-initialMousePoint.x), (int)(mouse->lLastY-initialMousePoint.y) ); SDL_SendMouseMotion(data->window, 0, 1, (int)(mouse->lLastX-initialMousePoint.x), (int)(mouse->lLastY-initialMousePoint.y));
initialMousePoint.x = mouse->lLastX; initialMousePoint.x = mouse->lLastX;
initialMousePoint.y = mouse->lLastY; initialMousePoint.y = mouse->lLastY;
} }
WIN_CheckRawMouseButtons( mouse->usButtonFlags, data ); WIN_CheckRawMouseButtons(mouse->usButtonFlags, data);
} }
} }
break; break;
@ -531,9 +519,9 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_KEYDOWN: case WM_KEYDOWN:
case WM_SYSKEYDOWN: case WM_SYSKEYDOWN:
{ {
SDL_Scancode code = WindowsScanCodeToSDLScanCode( lParam, wParam ); SDL_Scancode code = WindowsScanCodeToSDLScanCode(lParam, wParam);
if ( code != SDL_SCANCODE_UNKNOWN ) { if (code != SDL_SCANCODE_UNKNOWN) {
SDL_SendKeyboardKey(SDL_PRESSED, code ); SDL_SendKeyboardKey(SDL_PRESSED, code);
} }
} }
if (msg == WM_KEYDOWN) { if (msg == WM_KEYDOWN) {
@ -556,18 +544,18 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_SYSKEYUP: case WM_SYSKEYUP:
case WM_KEYUP: case WM_KEYUP:
{ {
SDL_Scancode code = WindowsScanCodeToSDLScanCode( lParam, wParam ); SDL_Scancode code = WindowsScanCodeToSDLScanCode(lParam, wParam);
const Uint8 *keyboardState = SDL_GetKeyboardState(NULL); const Uint8 *keyboardState = SDL_GetKeyboardState(NULL);
/* Detect relevant keyboard shortcuts */ /* Detect relevant keyboard shortcuts */
if (keyboardState[SDL_SCANCODE_LALT] == SDL_PRESSED || keyboardState[SDL_SCANCODE_RALT] == SDL_PRESSED ) { if (keyboardState[SDL_SCANCODE_LALT] == SDL_PRESSED || keyboardState[SDL_SCANCODE_RALT] == SDL_PRESSED) {
/* ALT+F4: Close window */ /* ALT+F4: Close window */
if (code == SDL_SCANCODE_F4) { if (code == SDL_SCANCODE_F4) {
SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_CLOSE, 0, 0); SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_CLOSE, 0, 0);
} }
} }
if ( code != SDL_SCANCODE_UNKNOWN ) { if (code != SDL_SCANCODE_UNKNOWN) {
if (code == SDL_SCANCODE_PRINTSCREEN && if (code == SDL_SCANCODE_PRINTSCREEN &&
keyboardState[code] == SDL_RELEASED) { keyboardState[code] == SDL_RELEASED) {
SDL_SendKeyboardKey(SDL_PRESSED, code); SDL_SendKeyboardKey(SDL_PRESSED, code);
@ -736,8 +724,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_SIZE: case WM_SIZE:
{ {
switch (wParam) switch (wParam) {
{
case SIZE_MAXIMIZED: case SIZE_MAXIMIZED:
SDL_SendWindowEvent(data->window, SDL_SendWindowEvent(data->window,
SDL_WINDOWEVENT_MAXIMIZED, 0, 0); SDL_WINDOWEVENT_MAXIMIZED, 0, 0);
@ -762,6 +749,9 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
if (hittest == HTCLIENT) { if (hittest == HTCLIENT) {
SetCursor(SDL_cursor); SetCursor(SDL_cursor);
returnCode = TRUE; returnCode = TRUE;
} else if (!g_WindowFrameUsableWhileCursorHidden && !SDL_cursor) {
SetCursor(NULL);
returnCode = TRUE;
} }
} }
break; break;
@ -903,7 +893,7 @@ WIN_PumpEvents(_THIS)
while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
/* Always translate the message in case it's a non-SDL window (e.g. with Qt integration) */ /* Always translate the message in case it's a non-SDL window (e.g. with Qt integration) */
TranslateMessage(&msg); TranslateMessage(&msg);
DispatchMessage( &msg ); DispatchMessage(&msg);
/* Make sure we don't busy loop here forever if there are lots of events coming in */ /* Make sure we don't busy loop here forever if there are lots of events coming in */
if (SDL_TICKS_PASSED(msg.time, start_ticks)) { if (SDL_TICKS_PASSED(msg.time, start_ticks)) {

16
src/video/windows/SDL_windowsvideo.c
View File

@ -24,6 +24,7 @@
#include "SDL_main.h" #include "SDL_main.h"
#include "SDL_video.h" #include "SDL_video.h"
#include "SDL_hints.h"
#include "SDL_mouse.h" #include "SDL_mouse.h"
#include "SDL_system.h" #include "SDL_system.h"
#include "../SDL_sysvideo.h" #include "../SDL_sysvideo.h"
@ -37,6 +38,18 @@
static int WIN_VideoInit(_THIS); static int WIN_VideoInit(_THIS);
static void WIN_VideoQuit(_THIS); static void WIN_VideoQuit(_THIS);
/* Hints */
SDL_bool g_WindowFrameUsableWhileCursorHidden = SDL_TRUE;
static void UpdateWindowFrameUsableWhileCursorHidden(void *userdata, const char *name, const char *oldValue, const char *newValue)
{
if (newValue && *newValue == '0') {
g_WindowFrameUsableWhileCursorHidden = SDL_FALSE;
} else {
g_WindowFrameUsableWhileCursorHidden = SDL_TRUE;
}
}
/* Windows driver bootstrap functions */ /* Windows driver bootstrap functions */
@ -150,6 +163,7 @@ WIN_CreateDevice(int devindex)
return device; return device;
} }
VideoBootStrap WINDOWS_bootstrap = { VideoBootStrap WINDOWS_bootstrap = {
"windows", "SDL Windows video driver", WIN_Available, WIN_CreateDevice "windows", "SDL Windows video driver", WIN_Available, WIN_CreateDevice
}; };
@ -164,6 +178,8 @@ WIN_VideoInit(_THIS)
WIN_InitKeyboard(_this); WIN_InitKeyboard(_this);
WIN_InitMouse(_this); WIN_InitMouse(_this);
SDL_AddHintCallback( SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN, UpdateWindowFrameUsableWhileCursorHidden, NULL );
return 0; return 0;
} }

1
src/video/windows/SDL_windowsvideo.h
View File

@ -171,6 +171,7 @@ typedef struct SDL_VideoData
TSFSink *ime_ippasink; TSFSink *ime_ippasink;
} SDL_VideoData; } SDL_VideoData;
extern SDL_bool g_WindowFrameUsableWhileCursorHidden;
typedef struct IDirect3D9 IDirect3D9; typedef struct IDirect3D9 IDirect3D9;
extern SDL_bool D3D_LoadDLL( void **pD3DDLL, IDirect3D9 **pDirect3D9Interface ); extern SDL_bool D3D_LoadDLL( void **pD3DDLL, IDirect3D9 **pDirect3D9Interface );