Skip to content

cosmetic #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
john-tornblom merged 1 commit into from
Aug 28, 2025
Merged

cosmetic #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1455,48 +1455,48 @@ elseif(PS5)
file(GLOB PS5_MAIN_SOURCES ${SDL2_SOURCE_DIR}/src/main/ps5/*.c)
list(APPEND SDLMAIN_SOURCES ${PS5_MAIN_SOURCES})
list(APPEND EXTRA_LIBS SceSystemService)
if (SDL_TIMERS)

if(SDL_TIMERS)
set(SDL_TIMER_UNIX 1)
file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/unix/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${TIMER_SOURCES})
set(HAVE_SDL_TIMERS TRUE)
endif ()
if (SDL_FILESYSTEM)
endif()
if(SDL_FILESYSTEM)
set(SDL_FILESYSTEM_PS5 1)
file(GLOB PS5_FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/ps5/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${PS5_FILESYSTEM_SOURCES})
set(HAVE_SDL_FILESYSTEM TRUE)
list(APPEND EXTRA_LIBS SceUserService)
endif ()
if (SDL_JOYSTICK)
endif()
if(SDL_JOYSTICK)
set(SDL_JOYSTICK_PS5 1)
file(GLOB PS5_JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/ps5/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${PS5_JOYSTICK_SOURCES})
set(HAVE_SDL_JOYSTICK TRUE)
list(APPEND EXTRA_LIBS ScePad SceUserService)
endif ()
endif()
if (SDL_AUDIO)
set(SDL_AUDIO_DRIVER_PS5 1)
file(GLOB PS5_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/ps5/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${PS5_AUDIO_SOURCES})
set(HAVE_SDL_AUDIO TRUE)
list(APPEND EXTRA_LIBS SceAudioOut)
list(APPEND EXTRA_LIBS samplerate) # FIXME
endif ()
endif()
if (SDL_VIDEO)
set(SDL_VIDEO_DRIVER_PS5 1)
file(GLOB PS5_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/ps5/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${PS5_VIDEO_SOURCES})
set(HAVE_SDL_VIDEO TRUE)
list(APPEND EXTRA_LIBS SceVideoOut SceKeyboard SceImeDialog SceUserService SceSystemService)
if (SDL_OPENGL)
if(SDL_OPENGL)
set(SDL_VIDEO_OPENGL 1)
set(SDL_VIDEO_OPENGL_OSMESA 1)
set(HAVE_OPENGL TRUE)
endif()
endif ()
if (SDL_MISC)
endif()
if(SDL_MISC)
file(GLOB PS5_MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/ps5/*.c)
list(APPEND SOURCE_FILES ${PS5_MISC_SOURCES})
set(HAVE_SDL_MISC TRUE)
Expand Down
2 changes: 1 addition & 1 deletion src/misc/ps5/SDL_sysurl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ int SDL_SYS_OpenURL(const char *url)

err = sceUserServiceInitialize(0);
if (err != 0 && err != 0x80960003) {
SDL_SetError("sceUserServiceInitialize: 0x%08x", err);
SDL_SetError("sceUserServiceInitialize: 0x%08x", err);
}

return sceSystemServiceLaunchWebBrowser(url, 0);
Expand Down
83 changes: 41 additions & 42 deletions src/video/ps5/SDL_ps5keyboard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,21 @@ typedef struct SceImeDialogParam
{
int userId;
enum {
SCE_IME_TYPE_DEFAULT,
SCE_IME_TYPE_BASIC_LATIN,
SCE_IME_TYPE_URL,
SCE_IME_TYPE_MAIL,
SCE_IME_TYPE_NUMBER
SCE_IME_TYPE_DEFAULT,
SCE_IME_TYPE_BASIC_LATIN,
SCE_IME_TYPE_URL,
SCE_IME_TYPE_MAIL,
SCE_IME_TYPE_NUMBER
} type;
uint64_t supportedLanguages;
enum {
SCE_IME_ENTER_LABEL_DEFAULT,
SCE_IME_ENTER_LABEL_SEND,
SCE_IME_ENTER_LABEL_SEARCH,
SCE_IME_ENTER_LABEL_GO,
SCE_IME_ENTER_LABEL_DEFAULT,
SCE_IME_ENTER_LABEL_SEND,
SCE_IME_ENTER_LABEL_SEARCH,
SCE_IME_ENTER_LABEL_GO,
} enterLabel;
enum {
SCE_IME_INPUT_METHOD_DEFAULT
SCE_IME_INPUT_METHOD_DEFAULT
} inputMethod;
SceImeTextFilter filter;
uint32_t option;
Expand All @@ -77,14 +77,14 @@ typedef struct SceImeDialogParam
float posx;
float posy;
enum {
SCE_IME_HALIGN_LEFT,
SCE_IME_HALIGN_CENTER,
SCE_IME_HALIGN_RIGHT
SCE_IME_HALIGN_LEFT,
SCE_IME_HALIGN_CENTER,
SCE_IME_HALIGN_RIGHT
} halign;
enum {
SCE_IME_VALIGN_TOP,
SCE_IME_VALIGN_CENTER,
SCE_IME_VALIGN_BOTTOM
SCE_IME_VALIGN_TOP,
SCE_IME_VALIGN_CENTER,
SCE_IME_VALIGN_BOTTOM
} valign;
const wchar_t *placeholder;
const wchar_t *title;
Expand All @@ -94,9 +94,9 @@ typedef struct SceImeDialogParam
typedef struct SceImeDialogResult
{
enum {
SCE_IME_DIALOG_END_STATUS_OK,
SCE_IME_DIALOG_END_STATUS_USER_CANCELED,
SCE_IME_DIALOG_END_STATUS_ABORTED,
SCE_IME_DIALOG_END_STATUS_OK,
SCE_IME_DIALOG_END_STATUS_USER_CANCELED,
SCE_IME_DIALOG_END_STATUS_ABORTED,
} outcome;
int8_t reserved[12];
} SceImeDialogResult;
Expand Down Expand Up @@ -178,7 +178,7 @@ int PS5_Keyboard_Init(void)

err = sceKeyboardInit();
if (err != 0) {
return SDL_SetError("scePadInit: 0x%08x", err);
return SDL_SetError("sceKeyboardInit: 0x%08x", err);
}

return 0;
Expand All @@ -190,43 +190,42 @@ static int PS5_ImeDialog_PumpEvents(void)
SceImeDialogResult result = {0};
char text[0x800];

if(g_ime_dialog_status == status) {
return 0;
} else {
g_ime_dialog_status = status;
if (g_ime_dialog_status == status) {
return 0;
}
g_ime_dialog_status = status;

switch(status) {
switch (status) {
case SCE_IME_DIALOG_STATUS_NONE:
return 0;
return 0;

case SCE_IME_DIALOG_STATUS_RUNNING:
return 0;
return 0;

case SCE_IME_DIALOG_STATUS_FINISHED:
break;
break;

default:
return -1;
return -1;
}

if(sceImeDialogGetResult(&result)) {
return -1;
if (sceImeDialogGetResult(&result)) {
return -1;
}

switch(result.outcome) {
switch (result.outcome) {
case SCE_IME_DIALOG_END_STATUS_OK:
if(wcstombs(text, g_ime_dialog_text, sizeof(text)) >= 0) {
SDL_SendKeyboardText(text);
}
SDL_SendKeyboardKeyAutoRelease(SDL_SCANCODE_RETURN);
break;
if (wcstombs(text, g_ime_dialog_text, sizeof(text)) >= 0) {
SDL_SendKeyboardText(text);
}
SDL_SendKeyboardKeyAutoRelease(SDL_SCANCODE_RETURN);
break;

case SCE_IME_DIALOG_END_STATUS_USER_CANCELED:
case SCE_IME_DIALOG_END_STATUS_ABORTED:
break;
break;
default:
return -1;
return -1;
}

sceImeDialogTerm();
Expand Down Expand Up @@ -345,14 +344,14 @@ void PS5_ShowScreenKeyboard(_THIS, SDL_Window *window)

void PS5_HideScreenKeyboard(_THIS, SDL_Window *window)
{
if(g_ime_dialog_status == SCE_IME_DIALOG_STATUS_FINISHED) {
sceImeDialogTerm();
if (g_ime_dialog_status == SCE_IME_DIALOG_STATUS_FINISHED) {
sceImeDialogTerm();
}
}

SDL_bool PS5_IsScreenKeyboardShown(_THIS, SDL_Window *window)
{
if(g_ime_dialog_status == SCE_IME_DIALOG_STATUS_RUNNING) {
if (g_ime_dialog_status == SCE_IME_DIALOG_STATUS_RUNNING) {
return SDL_TRUE;
}

Expand Down
4 changes: 2 additions & 2 deletions src/video/ps5/SDL_ps5osmesa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ static int OSMesa_LoadLibrary(_THIS, const char *path)

static void OSMesa_UnloadLibrary(_THIS)
{
if(osmesa_lib) {
if (osmesa_lib) {
dlclose(osmesa_lib);
}

Expand Down Expand Up @@ -135,7 +135,7 @@ static SDL_GLContext OSMesa_CreateContext(_THIS, SDL_Window * window)
return NULL;
}

if(OSMesa_MakeCurrent(_this, window, ctx)) {
if (OSMesa_MakeCurrent(_this, window, ctx)) {
return NULL;
}

Expand Down
Loading