encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit '78089e6598240178b62d6720eec041cc698a5e7c' into main

This commit is contained in:
Sam Lantinga 2022-07-05 21:39:29 -07:00
parent fbc9800304 78089e6598
commit 6b0e1adfe9
13 changed files with 4 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VisualC-GDK/SDL/SDL.vcxproj
View File

@ -215,7 +215,6 @@
<ClInclude Include="..\..\src\events\SDL_gesture_c.h" />
<ClInclude Include="..\..\src\events\SDL_keyboard_c.h" />
<ClInclude Include="..\..\src\events\SDL_mouse_c.h" />
<ClInclude Include="..\..\src\events\SDL_sysevents.h" />
<ClInclude Include="..\..\src\events\SDL_touch_c.h" />
<ClInclude Include="..\..\src\events\SDL_windowevents_c.h" />
<ClInclude Include="..\..\src\haptic\SDL_haptic_c.h" />

3
VisualC-GDK/SDL/SDL.vcxproj.filters
View File

@ -471,9 +471,6 @@
<ClInclude Include="..\..\src\events\SDL_mouse_c.h">
<Filter>events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\events\SDL_sysevents.h">
<Filter>events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\events\SDL_touch_c.h">
<Filter>events</Filter>
</ClInclude>

1
VisualC-WinRT/SDL-UWP.vcxproj
View File

@ -107,7 +107,6 @@
<ClInclude Include="..\src\events\SDL_events_c.h" />
<ClInclude Include="..\src\events\SDL_keyboard_c.h" />
<ClInclude Include="..\src\events\SDL_mouse_c.h" />
<ClInclude Include="..\src\events\SDL_sysevents.h" />
<ClInclude Include="..\src\events\SDL_touch_c.h" />
<ClInclude Include="..\src\events\SDL_windowevents_c.h" />
<ClInclude Include="..\src\haptic\SDL_haptic_c.h" />

3
VisualC-WinRT/SDL-UWP.vcxproj.filters
View File

@ -240,9 +240,6 @@
<ClInclude Include="..\src\events\SDL_mouse_c.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\src\events\SDL_sysevents.h">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\src\events\SDL_touch_c.h">
<Filter>Source Files</Filter>
</ClInclude>

1
VisualC/SDL/SDL.vcxproj
View File

@ -320,7 +320,6 @@
<ClInclude Include="..\..\src\events\SDL_gesture_c.h" />
<ClInclude Include="..\..\src\events\SDL_keyboard_c.h" />
<ClInclude Include="..\..\src\events\SDL_mouse_c.h" />
<ClInclude Include="..\..\src\events\SDL_sysevents.h" />
<ClInclude Include="..\..\src\events\SDL_touch_c.h" />
<ClInclude Include="..\..\src\events\SDL_windowevents_c.h" />
<ClInclude Include="..\..\src\haptic\SDL_haptic_c.h" />

3
VisualC/SDL/SDL.vcxproj.filters
View File

@ -471,9 +471,6 @@
<ClInclude Include="..\..\src\events\SDL_mouse_c.h">
<Filter>events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\events\SDL_sysevents.h">
<Filter>events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\events\SDL_touch_c.h">
<Filter>events</Filter>
</ClInclude>

20
Xcode/SDL/SDL.xcodeproj/project.pbxproj
View File

@ -181,7 +181,6 @@
A75FCD3523E25AB700529352 /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D51595D4D800BBD41B /* SDL_gesture.h */; settings = {ATTRIBUTES = (Public, ); }; };
A75FCD3623E25AB700529352 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A89F23E2513F00DCD162 /* SDL_sysaudio.h */; };
A75FCD3723E25AB700529352 /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D61595D4D800BBD41B /* SDL_haptic.h */; settings = {ATTRIBUTES = (Public, ); }; };
A75FCD3823E25AB700529352 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
A75FCD3923E25AB700529352 /* math_libm.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A92623E2514000DCD162 /* math_libm.h */; };
A75FCD3A23E25AB700529352 /* SDL_uikitvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A62223E2513D00DCD162 /* SDL_uikitvideo.h */; };
A75FCD3B23E25AB700529352 /* SDL_cocoamouse.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A69823E2513E00DCD162 /* SDL_cocoamouse.h */; };
@ -560,7 +559,6 @@
A75FCEEE23E25AC700529352 /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D51595D4D800BBD41B /* SDL_gesture.h */; settings = {ATTRIBUTES = (Public, ); }; };
A75FCEEF23E25AC700529352 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A89F23E2513F00DCD162 /* SDL_sysaudio.h */; };
A75FCEF023E25AC700529352 /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D61595D4D800BBD41B /* SDL_haptic.h */; settings = {ATTRIBUTES = (Public, ); }; };
A75FCEF123E25AC700529352 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
A75FCEF223E25AC700529352 /* math_libm.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A92623E2514000DCD162 /* math_libm.h */; };
A75FCEF323E25AC700529352 /* SDL_uikitvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A62223E2513D00DCD162 /* SDL_uikitvideo.h */; };
A75FCEF423E25AC700529352 /* SDL_cocoamouse.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A69823E2513E00DCD162 /* SDL_cocoamouse.h */; };
@ -963,7 +961,6 @@
A769B0B923E259AE00872273 /* vk_sdk_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A73D23E2513E00DCD162 /* vk_sdk_platform.h */; };
A769B0BA23E259AE00872273 /* blank_cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93223E2514000DCD162 /* blank_cursor.h */; };
A769B0BC23E259AE00872273 /* SDL_sysaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A89F23E2513F00DCD162 /* SDL_sysaudio.h */; };
A769B0BE23E259AE00872273 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
A769B0BF23E259AE00872273 /* math_libm.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A92623E2514000DCD162 /* math_libm.h */; };
A769B0C023E259AE00872273 /* SDL_uikitvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A62223E2513D00DCD162 /* SDL_uikitvideo.h */; };
A769B0C123E259AE00872273 /* SDL_cocoamouse.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A69823E2513E00DCD162 /* SDL_cocoamouse.h */; };
@ -3164,12 +3161,6 @@
A7D8BB9023E2514500DCD162 /* SDL_touch.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A93E23E2514000DCD162 /* SDL_touch.c */; };
A7D8BB9123E2514500DCD162 /* SDL_touch.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A93E23E2514000DCD162 /* SDL_touch.c */; };
A7D8BB9223E2514500DCD162 /* SDL_touch.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A93E23E2514000DCD162 /* SDL_touch.c */; };
A7D8BB9323E2514500DCD162 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
A7D8BB9423E2514500DCD162 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
A7D8BB9523E2514500DCD162 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
A7D8BB9623E2514500DCD162 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
A7D8BB9723E2514500DCD162 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
A7D8BB9823E2514500DCD162 /* SDL_sysevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */; };
A7D8BB9923E2514500DCD162 /* SDL_gesture.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A94023E2514000DCD162 /* SDL_gesture.c */; };
A7D8BB9A23E2514500DCD162 /* SDL_gesture.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A94023E2514000DCD162 /* SDL_gesture.c */; };
A7D8BB9B23E2514500DCD162 /* SDL_gesture.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A94023E2514000DCD162 /* SDL_gesture.c */; };
@ -3977,7 +3968,6 @@
A7D8A93C23E2514000DCD162 /* SDL_quit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_quit.c; sourceTree = "<group>"; };
A7D8A93D23E2514000DCD162 /* SDL_keyboard_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_keyboard_c.h; sourceTree = "<group>"; };
A7D8A93E23E2514000DCD162 /* SDL_touch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_touch.c; sourceTree = "<group>"; };
A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysevents.h; sourceTree = "<group>"; };
A7D8A94023E2514000DCD162 /* SDL_gesture.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_gesture.c; sourceTree = "<group>"; };
A7D8A94123E2514000DCD162 /* scancodes_xfree86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scancodes_xfree86.h; sourceTree = "<group>"; };
A7D8A94223E2514000DCD162 /* SDL_events_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_events_c.h; sourceTree = "<group>"; };
@ -5253,7 +5243,6 @@
A7D8A92B23E2514000DCD162 /* SDL_mouse_c.h */,
A7D8A92A23E2514000DCD162 /* SDL_mouse.c */,
A7D8A93C23E2514000DCD162 /* SDL_quit.c */,
A7D8A93F23E2514000DCD162 /* SDL_sysevents.h */,
A7D8A93723E2514000DCD162 /* SDL_touch_c.h */,
A7D8A93E23E2514000DCD162 /* SDL_touch.c */,
A7D8A94323E2514000DCD162 /* SDL_windowevents_c.h */,
@ -5351,7 +5340,6 @@
A75FDBCC23EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A75FCD3623E25AB700529352 /* SDL_sysaudio.h in Headers */,
A75FCD3723E25AB700529352 /* SDL_haptic.h in Headers */,
A75FCD3823E25AB700529352 /* SDL_sysevents.h in Headers */,
A75FCD3923E25AB700529352 /* math_libm.h in Headers */,
A75FCD3A23E25AB700529352 /* SDL_uikitvideo.h in Headers */,
A75FCD3B23E25AB700529352 /* SDL_cocoamouse.h in Headers */,
@ -5578,7 +5566,6 @@
A75FDBCD23EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A75FCEEF23E25AC700529352 /* SDL_sysaudio.h in Headers */,
A75FCEF023E25AC700529352 /* SDL_haptic.h in Headers */,
A75FCEF123E25AC700529352 /* SDL_sysevents.h in Headers */,
A75FCEF223E25AC700529352 /* math_libm.h in Headers */,
A75FCEF323E25AC700529352 /* SDL_uikitvideo.h in Headers */,
A75FCEF423E25AC700529352 /* SDL_cocoamouse.h in Headers */,
@ -5784,7 +5771,6 @@
A75FDB5D23E39E6100529352 /* hidapi.h in Headers */,
A75FDBCA23EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A769B0BC23E259AE00872273 /* SDL_sysaudio.h in Headers */,
A769B0BE23E259AE00872273 /* SDL_sysevents.h in Headers */,
A769B0BF23E259AE00872273 /* math_libm.h in Headers */,
A769B0C023E259AE00872273 /* SDL_uikitvideo.h in Headers */,
A769B0C123E259AE00872273 /* SDL_cocoamouse.h in Headers */,
@ -6054,7 +6040,6 @@
A7D8B4C523E2514300DCD162 /* SDL_steamcontroller.h in Headers */,
A7D88A5223E2437C00DCD162 /* SDL_surface.h in Headers */,
A7D8B85B23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
A7D8BB9423E2514500DCD162 /* SDL_sysevents.h in Headers */,
A7D8AAD523E2514100DCD162 /* SDL_syshaptic.h in Headers */,
A7D8AAE123E2514100DCD162 /* SDL_syshaptic_c.h in Headers */,
A7D8B58223E2514300DCD162 /* SDL_sysjoystick.h in Headers */,
@ -6286,7 +6271,6 @@
A7D8B4C623E2514300DCD162 /* SDL_steamcontroller.h in Headers */,
A7D88C0D23E24BED00DCD162 /* SDL_surface.h in Headers */,
A7D8B85C23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
A7D8BB9523E2514500DCD162 /* SDL_sysevents.h in Headers */,
A7D8AAD623E2514100DCD162 /* SDL_syshaptic.h in Headers */,
A7D8AAE223E2514100DCD162 /* SDL_syshaptic_c.h in Headers */,
A7D8B58323E2514300DCD162 /* SDL_sysjoystick.h in Headers */,
@ -6415,7 +6399,6 @@
A75FDB5C23E39E6100529352 /* hidapi.h in Headers */,
A75FDBC923EA380300529352 /* SDL_hidapi_rumble.h in Headers */,
A7D8B85E23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
A7D8BB9723E2514500DCD162 /* SDL_sysevents.h in Headers */,
A7D8BB0723E2514500DCD162 /* math_libm.h in Headers */,
A7D8AC7F23E2514100DCD162 /* SDL_uikitvideo.h in Headers */,
A7D8AF2223E2514100DCD162 /* SDL_cocoamouse.h in Headers */,
@ -6685,7 +6668,6 @@
A7D8BBC723E2561500DCD162 /* SDL_steamcontroller.h in Headers */,
AA75584C1595D4D800BBD41B /* SDL_surface.h in Headers */,
A7D8B85A23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
A7D8BB9323E2514500DCD162 /* SDL_sysevents.h in Headers */,
A7D8AAD423E2514100DCD162 /* SDL_syshaptic.h in Headers */,
A7D8AAE023E2514100DCD162 /* SDL_syshaptic_c.h in Headers */,
A7D8B58123E2514300DCD162 /* SDL_sysjoystick.h in Headers */,
@ -6808,7 +6790,6 @@
A7D8BB4823E2514500DCD162 /* blank_cursor.h in Headers */,
F395C1962569C68F00942BFF /* SDL_iokitjoystick_c.h in Headers */,
A7D8B85D23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
A7D8BB9623E2514500DCD162 /* SDL_sysevents.h in Headers */,
A7D8BB0623E2514500DCD162 /* math_libm.h in Headers */,
A7D8AF2123E2514100DCD162 /* SDL_cocoamouse.h in Headers */,
A7D8ADEF23E2514100DCD162 /* SDL_blit_slow.h in Headers */,
@ -7002,7 +6983,6 @@
DB313FD617554B71006C0E22 /* SDL_gesture.h in Headers */,
A7D8B85F23E2514400DCD162 /* SDL_sysaudio.h in Headers */,
DB313FD717554B71006C0E22 /* SDL_haptic.h in Headers */,
A7D8BB9823E2514500DCD162 /* SDL_sysevents.h in Headers */,
A7D8BB0823E2514500DCD162 /* math_libm.h in Headers */,
A7D8AC8023E2514100DCD162 /* SDL_uikitvideo.h in Headers */,
A7D8AF2323E2514100DCD162 /* SDL_cocoamouse.h in Headers */,

36
src/events/SDL_sysevents.h
View File

@ -1,36 +0,0 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
#include "../SDL_internal.h"
#include "../video/SDL_sysvideo.h"
/* Useful functions and variables from SDL_sysevents.c */
#if defined(__HAIKU__)
/* The Haiku event loops run in a separate thread */
#define MUST_THREAD_EVENTS
#endif
#if defined(__WIN32__) || defined(__GDK__) /* Windows doesn't allow a separate event thread */
#define CANT_THREAD_EVENTS
#endif
/* vi: set ts=4 sw=4 expandtab: */

2
src/video/nacl/SDL_naclevents.c
View File

@ -23,8 +23,8 @@
#if SDL_VIDEO_DRIVER_NACL
#include "SDL.h"
#include "../../events/SDL_sysevents.h"
#include "../../events/SDL_events_c.h"
#include "../SDL_sysvideo.h"
#include "SDL_naclevents_c.h"
#include "SDL_naclvideo.h"
#include "ppapi_simple/ps_event.h"

2
src/video/psp/SDL_pspevents.c
View File

@ -26,9 +26,9 @@
most of the API. */
#include "SDL.h"
#include "../../events/SDL_sysevents.h"
#include "../../events/SDL_events_c.h"
#include "../../events/SDL_keyboard_c.h"
#include "../SDL_sysvideo.h"
#include "SDL_pspvideo.h"
#include "SDL_pspevents_c.h"
#include "SDL_keyboard.h"

3
src/video/psp/SDL_pspevents_c.h
View File

@ -21,9 +21,6 @@
#include "SDL_pspvideo.h"
/* Variables and functions exported by SDL_sysevents.c to other parts
of the native video subsystem (SDL_sysvideo.c)
*/
extern void PSP_InitOSKeymap(_THIS);
extern void PSP_PumpEvents(_THIS);

2
src/video/raspberry/SDL_rpievents.c
View File

@ -23,9 +23,9 @@
#if SDL_VIDEO_DRIVER_RPI
#include "../../events/SDL_sysevents.h"
#include "../../events/SDL_events_c.h"
#include "../../events/SDL_keyboard_c.h"
#include "../SDL_sysvideo.h"
#include "SDL_rpivideo.h"
#include "SDL_rpievents_c.h"

2
src/video/wayland/SDL_waylandevents.c
View File

@ -28,9 +28,9 @@
#include "SDL_hints.h"
#include "../../core/unix/SDL_poll.h"
#include "../../events/SDL_sysevents.h"
#include "../../events/SDL_events_c.h"
#include "../../events/scancodes_xfree86.h"
#include "../SDL_sysvideo.h"
#include "SDL_waylandvideo.h"
#include "SDL_waylandevents_c.h"