early-access version 4083

2024-01-22 19:05:04 +01:00 · 2024-01-22 19:05:04 +01:00 · 9b38babf6f
commit 9b38babf6f
parent 757b2a0c83
10 changed files with 172 additions and 81 deletions
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 yuzu emulator early access
 =============

-This is the source code for early-access 4082.
+This is the source code for early-access 4083.

 ## Legal Notice

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt
@ -3,9 +3,6 @@

 package org.yuzu.yuzu_emu.adapters

-import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.drawable.LayerDrawable
 import android.net.Uri
 import android.text.TextUtils
 import android.view.LayoutInflater
@ -15,10 +12,6 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
-import androidx.core.content.res.ResourcesCompat
-import androidx.core.graphics.drawable.IconCompat
-import androidx.core.graphics.drawable.toBitmap
-import androidx.core.graphics.drawable.toDrawable
 import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
@ -30,7 +23,6 @@ import kotlinx.coroutines.withContext
 import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.databinding.CardGameBinding
 import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.model.GamesViewModel
@ -89,36 +81,13 @@ class GameAdapter(private val activity: AppCompatActivity) :
                )
                .apply()

-            val openIntent =
-                Intent(YuzuApplication.appContext, EmulationActivity::class.java).apply {
-                    action = Intent.ACTION_VIEW
-                    data = Uri.parse(game.path)
-                }
-
            activity.lifecycleScope.launch {
                withContext(Dispatchers.IO) {
-                    val layerDrawable = ResourcesCompat.getDrawable(
-                        YuzuApplication.appContext.resources,
-                        R.drawable.shortcut,
-                        null
-                    ) as LayerDrawable
-                    layerDrawable.setDrawableByLayerId(
-                        R.id.shortcut_foreground,
-                        GameIconUtils.getGameIcon(activity, game)
-                            .toDrawable(YuzuApplication.appContext.resources)
-                    )
-                    val inset = YuzuApplication.appContext.resources
-                        .getDimensionPixelSize(R.dimen.icon_inset)
-                    layerDrawable.setLayerInset(1, inset, inset, inset, inset)
                    val shortcut =
                        ShortcutInfoCompat.Builder(YuzuApplication.appContext, game.path)
                            .setShortLabel(game.title)
-                            .setIcon(
-                                IconCompat.createWithAdaptiveBitmap(
-                                    layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888)
-                                )
-                            )
-                            .setIntent(openIntent)
+                            .setIcon(GameIconUtils.getShortcutIcon(activity, game))
+                            .setIntent(game.launchIntent)
                            .build()
                    ShortcutManagerCompat.pushDynamicShortcut(YuzuApplication.appContext, shortcut)
                }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt
@ -4,6 +4,8 @@
 package org.yuzu.yuzu_emu.fragments

 import android.annotation.SuppressLint
+import android.content.pm.ShortcutInfo
+import android.content.pm.ShortcutManager
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.LayoutInflater
@ -84,6 +86,24 @@ class GamePropertiesFragment : Fragment() {
            view.findNavController().popBackStack()
        }

+        val shortcutManager = requireActivity().getSystemService(ShortcutManager::class.java)
+        binding.buttonShortcut.isEnabled = shortcutManager.isRequestPinShortcutSupported
+        binding.buttonShortcut.setOnClickListener {
+            viewLifecycleOwner.lifecycleScope.launch {
+                withContext(Dispatchers.IO) {
+                    val shortcut = ShortcutInfo.Builder(requireContext(), args.game.title)
+                        .setShortLabel(args.game.title)
+                        .setIcon(
+                            GameIconUtils.getShortcutIcon(requireActivity(), args.game)
+                                .toIcon(requireContext())
+                        )
+                        .setIntent(args.game.launchIntent)
+                        .build()
+                    shortcutManager.requestPinShortcut(shortcut, null)
+                }
+            }
+        }
+
        GameIconUtils.loadGameIcon(args.game, binding.imageGameScreen)
        binding.title.text = args.game.title
        binding.title.postDelayed(
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt
@ -3,6 +3,7 @@

 package org.yuzu.yuzu_emu.model

+import android.content.Intent
 import android.net.Uri
 import android.os.Parcelable
 import java.util.HashSet
@ -11,6 +12,7 @@ import kotlinx.serialization.Serializable
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
+import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.FileUtil
 import java.time.LocalDateTime
@ -61,6 +63,12 @@ class Game(
    val addonDir: String
        get() = DirectoryInitialization.userDirectory + "/load/" + programIdHex + "/"

+    val launchIntent: Intent
+        get() = Intent(YuzuApplication.appContext, EmulationActivity::class.java).apply {
+            action = Intent.ACTION_VIEW
+            data = Uri.parse(path)
+        }
+
    override fun equals(other: Any?): Boolean {
        if (other !is Game) {
            return false
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.kt
@ -5,7 +5,10 @@ package org.yuzu.yuzu_emu.utils

 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.graphics.drawable.LayerDrawable
 import android.widget.ImageView
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.graphics.drawable.IconCompat
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.graphics.drawable.toDrawable
 import androidx.lifecycle.LifecycleOwner
@ -85,4 +88,22 @@ object GameIconUtils {
        return imageLoader.execute(request)
            .drawable!!.toBitmap(config = Bitmap.Config.ARGB_8888)
    }
+
+    suspend fun getShortcutIcon(lifecycleOwner: LifecycleOwner, game: Game): IconCompat {
+        val layerDrawable = ResourcesCompat.getDrawable(
+            YuzuApplication.appContext.resources,
+            R.drawable.shortcut,
+            null
+        ) as LayerDrawable
+        layerDrawable.setDrawableByLayerId(
+            R.id.shortcut_foreground,
+            getGameIcon(lifecycleOwner, game).toDrawable(YuzuApplication.appContext.resources)
+        )
+        val inset = YuzuApplication.appContext.resources
+            .getDimensionPixelSize(R.dimen.icon_inset)
+        layerDrawable.setLayerInset(1, inset, inset, inset, inset)
+        return IconCompat.createWithAdaptiveBitmap(
+            layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888)
+        )
+    }
 }
--- a/src/android/app/src/main/res/drawable/ic_shortcut.xml
+++ b/src/android/app/src/main/res/drawable/ic_shortcut.xml
@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="?attr/colorControlNormal"
+        android:pathData="M280,920q-33,0 -56.5,-23.5T200,840v-720q0,-33 23.5,-56.5T280,40h400q33,0 56.5,23.5T760,120v160h-80v-40L280,240v480h400v-40h80v160q0,33 -23.5,56.5T680,920L280,920ZM686,520L480,520v120h-80v-120q0,-33 23.5,-56.5T480,440h206l-62,-64 56,-56 160,160 -160,160 -56,-56 62,-64Z" />
+</vector>
--- a/src/android/app/src/main/res/layout-w600dp/fragment_game_properties.xml
+++ b/src/android/app/src/main/res/layout-w600dp/fragment_game_properties.xml
@ -43,16 +43,35 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">

+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:orientation="horizontal">
+
            <Button
                android:id="@+id/button_back"
                style="?attr/materialIconButtonStyle"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:layout_margin="8dp"
                app:icon="@drawable/ic_back"
                app:iconSize="24dp"
-            app:iconTint="?attr/colorOnSurface" />
+                app:iconTint="?attr/colorOnSurface"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <Button
+                android:id="@+id/button_shortcut"
+                style="?attr/materialIconButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:icon="@drawable/ic_shortcut"
+                app:iconSize="24dp"
+                app:iconTint="?attr/colorOnSurface"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>

        <com.google.android.material.card.MaterialCardView
            style="?attr/materialCardViewElevatedStyle"
--- a/src/android/app/src/main/res/layout/fragment_game_properties.xml
+++ b/src/android/app/src/main/res/layout/fragment_game_properties.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
@ -22,16 +21,35 @@
            android:orientation="vertical"
            android:gravity="center_horizontal">

+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:orientation="horizontal">
+
                <Button
                    android:id="@+id/button_back"
                    style="?attr/materialIconButtonStyle"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:layout_gravity="start"
                    app:icon="@drawable/ic_back"
                    app:iconSize="24dp"
-                app:iconTint="?attr/colorOnSurface" />
+                    app:iconTint="?attr/colorOnSurface"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <Button
+                    android:id="@+id/button_shortcut"
+                    style="?attr/materialIconButtonStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:icon="@drawable/ic_shortcut"
+                    app:iconSize="24dp"
+                    app:iconTint="?attr/colorOnSurface"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>

            <com.google.android.material.card.MaterialCardView
                style="?attr/materialCardViewElevatedStyle"
@ -45,7 +63,7 @@
                    android:id="@+id/image_game_screen"
                    android:layout_width="175dp"
                    android:layout_height="175dp"
-                    tools:src="@drawable/default_icon"/>
+                    tools:src="@drawable/default_icon" />

            </com.google.android.material.card.MaterialCardView>

--- a/src/core/hle/service/psc/time/service_manager.cpp
+++ b/src/core/hle/service/psc/time/service_manager.cpp
@ -119,15 +119,21 @@ void ServiceManager::Handle_GetStaticServiceAsServiceManager(HLERequestContext&
 void ServiceManager::Handle_SetupStandardSteadyClockCore(HLERequestContext& ctx) {
    LOG_DEBUG(Service_Time, "called.");

-    IPC::RequestParser rp{ctx};
-    auto clock_source_id{rp.PopRaw<Common::UUID>()};
-    auto rtc_offset{rp.Pop<s64>()};
-    auto internal_offset{rp.Pop<s64>()};
-    auto test_offset{rp.Pop<s64>()};
-    auto is_rtc_reset_detected{rp.Pop<bool>()};
+    struct Parameters {
+        bool reset_detected;
+        Common::UUID clock_source_id;
+        s64 rtc_offset;
+        s64 internal_offset;
+        s64 test_offset;
+    };
+    static_assert(sizeof(Parameters) == 0x30);

-    auto res = SetupStandardSteadyClockCore(clock_source_id, rtc_offset, internal_offset,
-                                            test_offset, is_rtc_reset_detected);
+    IPC::RequestParser rp{ctx};
+    auto params{rp.PopRaw<Parameters>()};
+
+    auto res = SetupStandardSteadyClockCore(params.clock_source_id, params.rtc_offset,
+                                            params.internal_offset, params.test_offset,
+                                            params.reset_detected);

    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(res);
@ -162,11 +168,16 @@ void ServiceManager::Handle_SetupStandardNetworkSystemClockCore(HLERequestContex
 void ServiceManager::Handle_SetupStandardUserSystemClockCore(HLERequestContext& ctx) {
    LOG_DEBUG(Service_Time, "called.");

-    IPC::RequestParser rp{ctx};
-    auto time_point{rp.PopRaw<SteadyClockTimePoint>()};
-    auto automatic_correction{rp.Pop<bool>()};
+    struct Parameters {
+        bool automatic_correction;
+        SteadyClockTimePoint time_point;
+    };
+    static_assert(sizeof(Parameters) == 0x20);

-    auto res = SetupStandardUserSystemClockCore(time_point, automatic_correction);
+    IPC::RequestParser rp{ctx};
+    auto params{rp.PopRaw<Parameters>()};
+
+    auto res = SetupStandardUserSystemClockCore(params.time_point, params.automatic_correction);

    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(res);
@ -175,16 +186,21 @@ void ServiceManager::Handle_SetupStandardUserSystemClockCore(HLERequestContext&
 void ServiceManager::Handle_SetupTimeZoneServiceCore(HLERequestContext& ctx) {
    LOG_DEBUG(Service_Time, "called.");

+    struct Parameters {
+        u32 location_count;
+        LocationName name;
+        SteadyClockTimePoint time_point;
+        RuleVersion rule_version;
+    };
+    static_assert(sizeof(Parameters) == 0x50);
+
    IPC::RequestParser rp{ctx};
-    auto name{rp.PopRaw<LocationName>()};
-    auto time_point{rp.PopRaw<SteadyClockTimePoint>()};
-    auto rule_version{rp.PopRaw<RuleVersion>()};
-    auto location_count{rp.Pop<u32>()};
+    auto params{rp.PopRaw<Parameters>()};

    auto rule_buffer{ctx.ReadBuffer()};

-    auto res =
-        SetupTimeZoneServiceCore(name, time_point, rule_version, location_count, rule_buffer);
+    auto res = SetupTimeZoneServiceCore(params.name, params.time_point, params.rule_version,
+                                        params.location_count, rule_buffer);

    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(res);
@ -286,11 +302,22 @@ void ServiceManager::Handle_GetClosestAlarmInfo(HLERequestContext& ctx) {
    s64 time{};
    auto res = GetClosestAlarmInfo(is_valid, alarm_info, time);

-    IPC::ResponseBuilder rb{ctx, 5 + sizeof(AlarmInfo) / sizeof(u32)};
+    struct OutParameters {
+        bool is_valid;
+        AlarmInfo alarm_info;
+        s64 time;
+    };
+    static_assert(sizeof(OutParameters) == 0x20);
+
+    OutParameters out_params{
+        .is_valid = is_valid,
+        .alarm_info = alarm_info,
+        .time = time,
+    };
+
+    IPC::ResponseBuilder rb{ctx, 2 + sizeof(OutParameters) / sizeof(u32)};
    rb.Push(res);
-    rb.PushRaw<AlarmInfo>(alarm_info);
-    rb.Push<bool>(is_valid);
-    rb.Push<s64>(time);
+    rb.PushRaw<OutParameters>(out_params);
 }

 // =============================== Implementations ===========================
--- a/src/core/hle/service/psc/time/steady_clock.cpp
+++ b/src/core/hle/service/psc/time/steady_clock.cpp
@ -15,12 +15,12 @@ SteadyClock::SteadyClock(Core::System& system_, std::shared_ptr<TimeManager> man
    // clang-format off
         static const FunctionInfo functions[] = {
        {0, &SteadyClock::Handle_GetCurrentTimePoint, "GetCurrentTimePoint"},
-        {1, &SteadyClock::Handle_GetTestOffset, "GetTestOffset"},
-        {2, &SteadyClock::Handle_SetTestOffset, "SetTestOffset"},
-        {3, &SteadyClock::Handle_GetRtcValue, "GetRtcValue"},
-        {4, &SteadyClock::Handle_IsRtcResetDetected, "IsRtcResetDetected"},
-        {5, &SteadyClock::Handle_GetSetupResultValue, "GetSetupResultValue"},
-        {6, &SteadyClock::Handle_GetInternalOffset, "GetInternalOffset"},
+        {2, &SteadyClock::Handle_GetTestOffset, "GetTestOffset"},
+        {3, &SteadyClock::Handle_SetTestOffset, "SetTestOffset"},
+        {100, &SteadyClock::Handle_GetRtcValue, "GetRtcValue"},
+        {101, &SteadyClock::Handle_IsRtcResetDetected, "IsRtcResetDetected"},
+        {102, &SteadyClock::Handle_GetSetupResultValue, "GetSetupResultValue"},
+        {200, &SteadyClock::Handle_GetInternalOffset, "GetInternalOffset"},
    };
    // clang-format on
    RegisterHandlers(functions);