YourWishes/dusk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input

Browse Source
This commit is contained in:
Dominic Masters
2025-08-11 23:51:37 -05:00
parent e946b74bd0
commit 7804cf75e6
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -10,8 +10,8 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
if(NOT DEFINED DUSK_TARGET_SYSTEM) if(NOT DEFINED DUSK_TARGET_SYSTEM)
set(DUSK_TARGET_SYSTEM "linux") # set(DUSK_TARGET_SYSTEM "linux")
# set(DUSK_TARGET_SYSTEM "psp") set(DUSK_TARGET_SYSTEM "psp")
endif() endif()
# Prep cache # Prep cache

20
src/dusksdl2/display/render.c
View File

@@ -10,14 +10,15 @@
#include "renderbackbuffer.h" #include "renderbackbuffer.h"
#include "rendertext.h" #include "rendertext.h"
#include "renderconsole.h" #include "renderconsole.h"
#include "console/console.h"
SDL_Window *RENDER_WINDOW; SDL_Window *RENDER_WINDOW;
SDL_Renderer *RENDER_RENDERER; SDL_Renderer *RENDER_RENDERER;
bool_t RENDER_RUNNING; bool_t RENDER_RUNNING;
errorret_t renderInit(void) { errorret_t renderInit(void) {
// Init SDL // Init SDL
if(SDL_Init(SDL_INIT_VIDEO) != 0) { if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER) != 0) {
errorThrow( errorThrow(
"SDL Failed to Initialize: %s", "SDL Failed to Initialize: %s",
SDL_GetError() SDL_GetError()
@@ -31,8 +32,8 @@ errorret_t renderInit(void) {
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
RENDER_WINDOW_WIDTH_DEFAULT, RENDER_WINDOW_WIDTH_DEFAULT,
RENDER_WINDOW_HEIGHT_DEFAULT, RENDER_WINDOW_HEIGHT_DEFAULT,
SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI | 0
SDL_INIT_GAMECONTROLLER // SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI
); );
if(!RENDER_WINDOW) { if(!RENDER_WINDOW) {
errorThrow("SDL_CreateWindow failed: %s", SDL_GetError()); errorThrow("SDL_CreateWindow failed: %s", SDL_GetError());
@@ -63,9 +64,14 @@ errorret_t renderInit(void) {
errorret_t renderDraw(void) { errorret_t renderDraw(void) {
SDL_Event event; SDL_Event event;
while(SDL_PollEvent(&event)) { while(SDL_PollEvent(&event)) {
if(event.type == SDL_QUIT) { switch(event.type) {
RENDER_RUNNING = false; case SDL_QUIT:
} RENDER_RUNNING = false;
break;
default:
break;
}
} }
// Bind the backbuffer // Bind the backbuffer

7
src/dusksdl2/input.c
View File

@@ -44,18 +44,17 @@ uint8_t inputStateGet() {
// Get gamepad state. // Get gamepad state.
for(int32_t i = 0; i < SDL_NumJoysticks(); i++) { for(int32_t i = 0; i < SDL_NumJoysticks(); i++) {
if(!SDL_IsGameController(i)) continue; if(!SDL_IsGameController(i)) continue;
SDL_GameController *controller = SDL_GameControllerOpen(i); SDL_GameController *controller = SDL_GameControllerOpen(i);
if(!controller) continue; if(!controller) continue;
inputsdlbuttonmap_t *map = INPUT_SDL_BUTTON_MAP; inputsdlbuttonmap_t *map = INPUT_SDL_BUTTON_MAP;
do { do {
if(SDL_GameControllerGetButton(controller, map->button)) { if(SDL_GameControllerGetButton(controller, map->button)) {
state |= map->bind; state |= map->bind;
} }
map++; map++;
} while(map->button != 0); } while(map->bind != 0);
} }
// Get keyboard state. // Get keyboard state.
@@ -66,7 +65,7 @@ uint8_t inputStateGet() {
state |= kbmap->bind; state |= kbmap->bind;
} }
kbmap++; kbmap++;
} while(kbmap->code != 0); } while(kbmap->bind != 0);
return state; return state;
} }