X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=steam.h;h=f6eadcd1ba81390c1c2aec756482b1f5440ce2f4;hb=0a33f65eecb5e75cddaefa08d3a5eb1a301d0479;hp=a92c3252e66b1b503b993ecaf1afd32db88798aa;hpb=47941822dae18a018c985847b052e70214a3ccc6;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/steam.h b/steam.h
index a92c325..f6eadcd 100644
--- a/steam.h
+++ b/steam.h
@@ -6,6 +6,7 @@
 #ifndef STEAM_H
 #define STEAM_H
 
+#define VG_GAME
 #include "vg/vg_steam.h"
 #include "vg/vg_steam_utils.h"
 #include "vg/vg_steam_networking.h"
@@ -53,46 +54,37 @@ VG_STATIC const char *steam_achievement_names[] =
 
 VG_STATIC void steam_store_achievements(void)
 {
-   if( steam_ready && steam_stats_ready )
-   {
+   if( steam_ready && steam_stats_ready ){
       SteamAPI_ISteamUserStats_StoreStats( hSteamUserStats );
    }
 }
 
 VG_STATIC void steam_set_achievement( const char *name )
 {
-   if( steam_ready && steam_stats_ready )
-   {
-      if( SteamAPI_ISteamUserStats_SetAchievement( hSteamUserStats, name ) )
-      {
+   if( steam_ready && steam_stats_ready ){
+      if( SteamAPI_ISteamUserStats_SetAchievement( hSteamUserStats, name ) ){
          vg_success( "Achievement set! '%s'\n", name );
       }
-      else
-      {
+      else{
          vg_warn( "Failed to set achievement: %s\n", name );
       }
    }
-   else
-   {
+   else{
       vg_warn( "Failed to set achievement (steam not ready): %s\n", name );
    }
 }
 
 VG_STATIC void steam_clear_achievement( const char *name )
 {
-   if( steam_ready && steam_stats_ready )
-   {
-      if( SteamAPI_ISteamUserStats_ClearAchievement( hSteamUserStats, name ) )
-      {
+   if( steam_ready && steam_stats_ready ){
+      if( SteamAPI_ISteamUserStats_ClearAchievement( hSteamUserStats, name ) ){
          vg_info( "Achievement cleared: '%s'\n", name );
       }
-      else
-      {
+      else{
          vg_warn( "Failed to clear achievement: %s\n", name );
       }
    }
-   else
-   {
+   else{
       vg_warn( "Failed to clear achievement (steam not ready): %s\n", name );
    }
 }
@@ -102,10 +94,8 @@ VG_STATIC int steam_list_achievements( int argc, char const *argv[] )
 {
    vg_info( "Achievements: \n" );
 
-   if( steam_ready && steam_stats_ready )
-   {
-      for( int i=0; i<vg_list_size(steam_achievement_names); i++ )
-      {
+   if( steam_ready && steam_stats_ready ){
+      for( int i=0; i<vg_list_size(steam_achievement_names); i++ ){
          int set = 0;
          const char *name = steam_achievement_names[i];
 
@@ -114,14 +104,12 @@ VG_STATIC int steam_list_achievements( int argc, char const *argv[] )
          {
             vg_info( "  %s %s\n", (set? "[YES]": "[   ]"), name );
          }
-         else
-         {
+         else{
             vg_warn( "  Error while fetching achievement status '%s'\n", name );
          }
       }
    }
-   else
-   {
+   else{
       vg_warn( "  Steam is not initialized, no results\n" );
    }
 
@@ -130,17 +118,14 @@ VG_STATIC int steam_list_achievements( int argc, char const *argv[] )
 
 VG_STATIC int steam_clear_all_achievements( int argc, char const *argv[] )
 {
-   if( steam_ready && steam_stats_ready )
-   {
-      for( int i=0; i<vg_list_size(steam_achievement_names); i++ )
-      {
+   if( steam_ready && steam_stats_ready ){
+      for( int i=0; i<vg_list_size(steam_achievement_names); i++ ){
          steam_clear_achievement( steam_achievement_names[i] );
       }
       
       steam_store_achievements();
    }
-   else
-   {
+   else{
       vg_warn( "steam is not initialized, cannot clear\n" );
    }
 
@@ -165,18 +150,69 @@ VG_STATIC void steam_on_recieve_current_stats( CallbackMsg_t *msg )
 {
    UserStatsReceived_t *rec = (UserStatsReceived_t *)msg->m_pubParam;
 
-   if( rec->m_eResult == k_EResultOK )
-   {
+   if( rec->m_eResult == k_EResultOK ){
       vg_info( "Recieved stats for: %lu (user: %lu)\n", rec->m_nGameID,
                                                         rec->m_steamIDUser );
       steam_stats_ready = 1;
    }
-   else
-   {
+   else{
       vg_error( "Error recieveing stats for user (%u)\n", rec->m_eResult );
    }
 }
 
+VG_STATIC ISteamInput *steam_hInput;
+
+VG_STATIC u32 utf8_byte0_byte_count( u8 char0 )
+{
+   for( u32 k=2; k<4; k++ ){
+      if( !(char0 & (0x80 >> k)) )
+         return k;
+   }
+
+   return 0;
+}
+
+VG_STATIC void str_utf8_collapse( const char *str, char *buf, u32 length )
+{
+   u8 *ustr = (u8 *)str;
+   u32 utf32_code = 0x00000000;
+   u32 i=0, j=0, utf32_byte_ct=0;
+
+   for(;i < length-1;){
+      if( ustr[i] == 0x00 )
+         break;
+      
+      if( ustr[i] & 0x80 ){
+         if( utf32_byte_ct ){
+            utf32_byte_ct --;
+            utf32_code |= (ustr[i] & 0x3F) << (utf32_byte_ct*6);
+
+            if( !utf32_byte_ct ){
+               const char *match;
+               size_t chars = anyascii( utf32_code, &match );
+
+               for( u32 k=0; k<VG_MIN(chars, length-1-j); k++ ){
+                  buf[ j++ ] = (u8)match[k];
+               }
+            }
+         }
+         else{
+            utf32_byte_ct = utf8_byte0_byte_count( ustr[i] )-1;
+            utf32_code = ustr[i] & (0x3F >> utf32_byte_ct);
+            utf32_code <<= utf32_byte_ct*6;
+         }
+      }
+      else{
+         utf32_byte_ct = 0x00;
+         buf[j ++] = str[i];
+      }
+
+      i++;
+   }
+
+   buf[j] = 0x00;
+}
+
 VG_STATIC int steam_init(void)
 {
    const char *username = NULL;
@@ -184,8 +220,7 @@ VG_STATIC int steam_init(void)
 #ifdef SR_NETWORKED
    vg_info( "Initializing steamworks\n" );
 
-   if( !SteamAPI_Init() )
-   {
+   if( !SteamAPI_Init() ){
       printf("\n");
       vg_error( "Steamworks failed to initialize\n" );
       return 1;
@@ -240,6 +275,10 @@ VG_STATIC int steam_init(void)
 		.function = steam_set_achievemnt_test
 	});
 
+   steam_hInput = SteamAPI_SteamInput();
+   SteamAPI_ISteamInput_Init( steam_hInput, 0 );
+   SteamAPI_ISteamInput_RunFrame( steam_hInput, 0 );
+   
 #endif
 
    /* TODO: On username update callback */
@@ -251,14 +290,55 @@ VG_STATIC int steam_init(void)
 
 VG_STATIC void steam_update(void)
 {
-   if( steam_ready )
+   if( steam_ready ){
       steamworks_event_loop( hSteamClientPipe );
+
+      /* TODO
+       * We can probably request this from SDL too
+       */
+      if( steam_hInput ){
+         SteamAPI_ISteamInput_RunFrame( steam_hInput, 0 );
+
+         InputHandle_t joy0 = SteamAPI_ISteamInput_GetControllerForGamepadIndex( 
+                                 steam_hInput, 0 );
+
+         vg_input.controller_should_use_trackpad_look = 0;
+         if( joy0 != 0 ){
+            ESteamInputType type = SteamAPI_ISteamInput_GetInputTypeForHandle(
+                                 steam_hInput, joy0 );
+
+            if( type == k_ESteamInputType_SteamController ){
+               vg_input.controller_should_use_trackpad_look = 1;
+               menu_display_controller = k_menu_controller_type_steam;
+            }
+            else if( type == k_ESteamInputType_SteamDeckController ){
+               menu_display_controller = k_menu_controller_type_steam_deck;
+            }
+            else if( type == k_ESteamInputType_PS3Controller ||
+                     type == k_ESteamInputType_PS4Controller ||
+                     type == k_ESteamInputType_PS5Controller )
+            {
+               menu_display_controller = k_menu_controller_type_playstation;
+            }
+            else if( type == k_ESteamInputType_XBox360Controller ||
+                     type == k_ESteamInputType_XBoxOneController )
+            {
+               menu_display_controller = k_menu_controller_type_xbox;
+            }
+            else{
+               /* currently unsupported controller */
+               menu_display_controller = k_menu_controller_type_xbox;
+            }
+         }
+         else
+            menu_display_controller = k_menu_controller_type_keyboard;
+      }
+   }
 }
 
-VG_STATIC void steam_end(void *nothing)
+VG_STATIC void steam_end(void)
 {
-   if( steam_ready )
-   {
+   if( steam_ready ){
       vg_info( "Shutting down\n..." );
       SteamAPI_Shutdown();
    }