gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GDK build: fix Xbox targets

Browse Source
This commit is contained in:
Daniel Ludwig
2024-07-25 08:19:29 +02:00
committed by Ozkan Sezer
parent 7e48d4522b
commit ff66ec5fb5
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1004,6 +1004,7 @@ static SDL_bool SkipAltGrLeftControl(WPARAM wParam, LPARAM lParam)
return SDL_FALSE; return SDL_FALSE;
} }
#if !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)
// Here is a trick: "Alt Gr" sends LCTRL, then RALT. We only // Here is a trick: "Alt Gr" sends LCTRL, then RALT. We only
// want the RALT message, so we try to see if the next message // want the RALT message, so we try to see if the next message
// is a RALT message. In that case, this is a false LCTRL! // is a RALT message. In that case, this is a false LCTRL!
@@ -1018,6 +1019,8 @@ static SDL_bool SkipAltGrLeftControl(WPARAM wParam, LPARAM lParam)
} }
} }
} }
#endif /* !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES) */
return SDL_FALSE; return SDL_FALSE;
} }
@@ -2299,10 +2302,10 @@ void WIN_PumpEvents(SDL_VideoDevice *_this)
WIN_CheckKeyboardAndMouseHotplug(_this, SDL_FALSE); WIN_CheckKeyboardAndMouseHotplug(_this, SDL_FALSE);
#endif /*!defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)*/
WIN_UpdateIMECandidates(_this); WIN_UpdateIMECandidates(_this);
#endif /*!defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)*/
#ifdef SDL_PLATFORM_GDK #ifdef SDL_PLATFORM_GDK
GDK_DispatchTaskQueue(); GDK_DispatchTaskQueue();
#endif #endif

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

@@ -345,6 +345,7 @@ typedef struct
void *data; void *data;
} TSFSink; } TSFSink;
#ifndef SDL_DISABLE_WINDOWS_IME
/* Definition from Win98DDK version of IMM.H */ /* Definition from Win98DDK version of IMM.H */
typedef struct tagINPUTCONTEXT2 typedef struct tagINPUTCONTEXT2
{ {
@@ -370,6 +371,7 @@ typedef struct tagINPUTCONTEXT2
DWORD fdwInit; DWORD fdwInit;
DWORD dwReserve[3]; DWORD dwReserve[3];
} INPUTCONTEXT2, *PINPUTCONTEXT2, NEAR *NPINPUTCONTEXT2, FAR *LPINPUTCONTEXT2; } INPUTCONTEXT2, *PINPUTCONTEXT2, NEAR *NPINPUTCONTEXT2, FAR *LPINPUTCONTEXT2;
#endif
/* Private display data */ /* Private display data */
@@ -458,8 +460,10 @@ struct SDL_VideoData
SDL_bool ime_horizontal_candidates; SDL_bool ime_horizontal_candidates;
#endif #endif
#if !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)
COMPOSITIONFORM ime_composition_area; COMPOSITIONFORM ime_composition_area;
CANDIDATEFORM ime_candidate_area; CANDIDATEFORM ime_candidate_area;
#endif /* !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES) */
#ifndef SDL_DISABLE_WINDOWS_IME #ifndef SDL_DISABLE_WINDOWS_IME
HKL ime_hkl; HKL ime_hkl;