diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7f78c0ab49..7418c5bfb5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -169,6 +169,8 @@ jobs: run: test "$(git rev-parse 'HEAD^{tree}')" = "$SOURCE_TREE" - name: Resolve the pinned Android NDK run: bash tools/ci/resolve-ndk.sh + - name: Check out MaliBridge + run: git submodule update --init external/MaliBridge - name: Plan component identities id: plan @@ -232,6 +234,7 @@ jobs: ${{ steps.preloads.outputs.cache-hit != 'true' && 'runtime' || '' }} ${{ steps.component-preloads.outputs.arm64 != 'true' && 'arm64-preloads' || '' }} ${{ steps.comet.outputs.cache-hit != 'true' && 'comet' || '' }} + vkbridge run: python3 tools/components/prepare.py tools - name: Build changed ARM64 preloads @@ -242,6 +245,9 @@ jobs: if: steps.preloads.outputs.cache-hit != 'true' run: python3 tools/components/prepare.py runtime + - name: Build the Mali bridge's Linux side + run: python3 tools/components/prepare.py vkbridge + - name: Fetch the Debian image the preloads build in if: steps.component-preloads.outputs.x86 != 'true' env: @@ -273,6 +279,12 @@ jobs: run: | set -euo pipefail bash tools/linuxfs/check-preloads.sh app/src/main/assets/linuxfs + D=app/src/main/assets/linuxfs + VKB="$D/usr/local/lib/vkbridge/libvulkan_droidbridge.so" + test -f "$VKB" && test -f "$D/usr/local/share/vkbridge/droidbridge_icd.json" && test -f "$D/usr/local/bin/droiddeck-vkbridge-smoke" + VKB_NEED=$(readelf -d "$VKB" | sed -n 's/.*NEEDED.*\[\(.*\)\]/\1/p' | grep -vx 'libc.so.6' | grep -vx 'ld-linux-aarch64.so.1' || true) + [ -z "$VKB_NEED" ] || { echo "::error::the bridge ICD needs $VKB_NEED"; exit 1; } + [ "$(readelf -Ws "$VKB" | awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {sub(/@.*/, "", $8); print $8}' | grep -c '^vk_icd')" = 3 ] || { echo "::error::the bridge ICD does not export the loader interface"; exit 1; } - name: Build GOG Galaxy companion if: steps.comet.outputs.cache-hit != 'true' @@ -559,6 +571,9 @@ jobs: echo "::warning::built proot pack $sha does not match tools/packs/proot/release.env ($PROOT_PACK_SHA256). This build publishes the pack it just built. Source builds keep downloading the pinned pack until release.env is updated." fi + - name: Check out MaliBridge + run: git submodule update --init external/MaliBridge + - name: Build id: build env: diff --git a/.gitmodules b/.gitmodules index 50f7a038b0..de75c26af5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ +[submodule "external/MaliBridge"] + path = external/MaliBridge + url = https://github.com/ASEbrahim/MaliBridge.git [submodule "tools/syncthing/syncthing-android"] path = tools/syncthing/syncthing-android url = https://github.com/researchxxl/syncthing-android diff --git a/.signing.env.example b/.signing.env.example new file mode 100644 index 0000000000..7b497c6a74 --- /dev/null +++ b/.signing.env.example @@ -0,0 +1,4 @@ +# Copy to .signing.env, fill in, chmod 600 .signing.env +RELEASE_KEYSTORE=/path/to/release.p12 +RELEASE_STORE_PASSWORD=change-me +RELEASE_KEY_ALIAS=droiddeck diff --git a/app/build.gradle b/app/build.gradle index 91fd2ad944..736d728ba2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -345,6 +345,21 @@ def buildRustStores = tasks.register('buildRustStores', Exec) { if (!skipRust) android.sourceSets.main.jniLibs.srcDir(rustJniLibsDir) tasks.named('preBuild').configure { dependsOn(buildRustStores) } +def maliBridgeDir = rootProject.file('external/MaliBridge') +def vkbridgeJniLibsDir = layout.buildDirectory.dir('vkbridgeJniLibs') +def buildVkBridgeServer = tasks.register('buildVkBridgeServer', Exec) { + description = 'Builds the Vulkan bridge server (libvkbridge_server.so) with the NDK.' + inputs.dir(new File(maliBridgeDir, 'common')) + inputs.dir(new File(maliBridgeDir, 'server')) + inputs.dir(new File(maliBridgeDir, 'third_party')) + inputs.file(new File(maliBridgeDir, 'scripts/build-server-android.sh')) + outputs.dir(vkbridgeJniLibsDir) + commandLine 'bash', new File(maliBridgeDir, 'scripts/build-server-android.sh').absolutePath, + android.ndkDirectory.absolutePath, vkbridgeJniLibsDir.get().asFile.absolutePath +} +android.sourceSets.main.jniLibs.srcDir(vkbridgeJniLibsDir) +tasks.named('preBuild').configure { dependsOn(buildVkBridgeServer) } + dependencies { implementation "org.opencv:opencv:${trackingPack.OPENCV_VERSION}" implementation 'org.khronos.openxr:openxr_loader_for_android:1.1.49' diff --git a/app/src/main/cpp/deviceinfo/vkinfo.c b/app/src/main/cpp/deviceinfo/vkinfo.c index 81ccc6b0dd..5846e055da 100644 --- a/app/src/main/cpp/deviceinfo/vkinfo.c +++ b/app/src/main/cpp/deviceinfo/vkinfo.c @@ -62,6 +62,7 @@ Java_com_droiddeck_launcher_gpu_VulkanInfo_nativeQuery(JNIEnv *env, jclass clazz LINE("driver_version=%u.%u.%u\n", p.driverVersion >> 22, (p.driverVersion >> 12) & 0x3ff, p.driverVersion & 0xfff); LINE("vendor_id=0x%04x\ndevice_id=0x%08x\n", p.vendorID, p.deviceID); LINE("max_image_2d=%u\n", p.limits.maxImageDimension2D); + LINE("max_push_constants=%u\n", p.limits.maxPushConstantsSize); uint32_t extCount = 0; if (vkEnumerateDeviceExtensionProperties) vkEnumerateDeviceExtensionProperties(device, NULL, &extCount, NULL); @@ -91,6 +92,7 @@ Java_com_droiddeck_launcher_gpu_VulkanInfo_nativeQuery(JNIEnv *env, jclass clazz vkGetPhysicalDeviceFeatures(device, &f); LINE("geometry_shader=%s\ntessellation_shader=%s\ntexture_bc=%s\n", f.geometryShader ? "yes" : "no", f.tessellationShader ? "yes" : "no", f.textureCompressionBC ? "yes" : "no"); + LINE("shader_int64=%s\n", f.shaderInt64 ? "yes" : "no"); } if (vkGetPhysicalDeviceMemoryProperties) { VkPhysicalDeviceMemoryProperties m; diff --git a/app/src/main/cpp/waylandcomp/src/sc_layer.c b/app/src/main/cpp/waylandcomp/src/sc_layer.c index ff90d37dca..c760d91c22 100644 --- a/app/src/main/cpp/waylandcomp/src/sc_layer.c +++ b/app/src/main/cpp/waylandcomp/src/sc_layer.c @@ -381,6 +381,26 @@ static int sniff_modifier(const struct droiddeck_native_handle *h, uint64_t *mod return 1; } +#define SC_MOD_GRALLOC (~0ULL - 1) + +static const char *pool_kind(uint64_t mod) { + return mod == MOD_QCOM_COMPRESSED ? "UBWC" : mod == SC_MOD_GRALLOC ? "gralloc-laid-out" : "linear"; +} + +static void describe_handle(const struct droiddeck_native_handle *h, char *out, size_t n) { + size_t o = 0; + out[0] = 0; + if (!h) { snprintf(out, n, "no handle"); return; } + for (int i = 0; i < h->numFds && i < 4 && o < n; i++) { + off_t sz = lseek(h->data[i], 0, SEEK_END); + if (sz >= 0) lseek(h->data[i], 0, SEEK_SET); + o += (size_t)snprintf(out + o, n - o, "%sfd%d %lld bytes", i ? ", " : "", i, (long long)sz); + } + if (o < n) o += (size_t)snprintf(out + o, n - o, "; ints"); + for (int i = 0; i < h->numInts && i < 8 && o < n; i++) + o += (size_t)snprintf(out + o, n - o, " %#x", (unsigned)h->data[h->numFds + i]); +} + static int g_alloc_failed; enum { TIER_UBWC, TIER_PLAIN, TIER_LINEAR }; @@ -416,22 +436,54 @@ static int alloc_slot(struct layer *l, struct slot *s, int w, int h, uint32_t fm AHardwareBuffer_Desc got; AHardwareBuffer_describe(ahb, &got); const struct droiddeck_native_handle *nh = api.getNativeHandle(ahb); uint64_t mod = MOD_LINEAR; - if (!sniff_modifier(nh, &mod)) { - if (tier < TIER_LINEAR) { + struct vkp_image *img = NULL; + const char *path; + char info[160] = ""; + if (sniff_modifier(nh, &mod)) { + img = vkp_image_import_dmabuf(nh->data[0], fmt == AHB_RGB10A2 ? DRM_ABGR2101010 : DRM_ABGR8888, mod, w, h, + got.stride * 4, 0, 1); + path = "dma-buf (QTI handle)"; + } else { + if (tier == TIER_UBWC) { + char hd[256]; + describe_handle(nh, hd, sizeof(hd)); + droiddeck_log("layer", "%s: gralloc handle is not a QTI one (%d fds, %d ints: %s): no UBWC request; " + "pool buffers are imported %s", l->name, nh ? nh->numFds : -1, nh ? nh->numInts : -1, hd, + vkp_can_import_ahb() ? "as AHardwareBuffers (the driver takes gralloc's own layout)" + : "as linear dma-bufs (this driver has no AHardwareBuffer import)"); AHardwareBuffer_release(ahb); - l->alloc_tier = TIER_LINEAR; - droiddeck_log("layer", "%s: gralloc handle layout unknown (%d fds, %d ints): using linear pool buffers", - l->name, nh ? nh->numFds : -1, nh ? nh->numInts : -1); + l->alloc_tier = vkp_can_import_ahb() ? TIER_PLAIN : TIER_LINEAR; continue; } - mod = MOD_LINEAR; + mod = SC_MOD_GRALLOC; + path = "AHardwareBuffer"; + img = vkp_image_import_ahb(ahb, info, sizeof(info)); + if (!img && tier == TIER_LINEAR) { + const off_t need = (off_t)got.stride * 4 * h; + int fd = -1, which = -1; + for (int i = 0; nh && i < nh->numFds; i++) { + off_t sz = lseek(nh->data[i], 0, SEEK_END); + if (sz >= 0) lseek(nh->data[i], 0, SEEK_SET); + if (sz >= need) { fd = nh->data[i]; which = i; break; } + } + if (fd < 0 && nh && nh->numFds > 0) { fd = nh->data[0]; which = 0; } + mod = MOD_LINEAR; + path = "linear dma-buf"; + img = fd >= 0 ? vkp_image_import_dmabuf(fd, fmt == AHB_RGB10A2 ? DRM_ABGR2101010 : DRM_ABGR8888, mod, + w, h, got.stride * 4, 0, 1) : NULL; + snprintf(info, sizeof(info), "handle fd %d of %d", which, nh ? nh->numFds : 0); + if (vkp_can_import_ahb()) + droiddeck_log("layer", "%s: AHardwareBuffer import failed: the linear dma-buf in the handle's fd %d " + "(of %d) -> %s", l->name, which, nh ? nh->numFds : 0, img ? "imported" : "failed too"); + } } - int fd = (nh && nh->numFds > 0) ? nh->data[0] : -1; - struct vkp_image *img = fd >= 0 ? vkp_image_import_dmabuf(fd, fmt == AHB_RGB10A2 ? DRM_ABGR2101010 : DRM_ABGR8888, - mod, w, h, got.stride * 4, 0, 1) : NULL; if (!img) { - droiddeck_log("layer", "%s: import of a %s %dx%d pool buffer (stride %u px) into the compositor's Turnip failed", - l->name, mod == MOD_QCOM_COMPRESSED ? "UBWC" : "linear", w, h, got.stride); + char hd[256]; + describe_handle(nh, hd, sizeof(hd)); + droiddeck_log("layer", "%s: import of a %s %dx%d pool buffer (stride %u px, %s, usage %#llx) into the " + "compositor's Turnip failed via %s; gralloc handle %d fds / %d ints: %s", l->name, + pool_kind(mod), w, h, got.stride, tier_name(tier), (unsigned long long)got.usage, path, + nh ? nh->numFds : -1, nh ? nh->numInts : -1, hd); AHardwareBuffer_release(ahb); if (tier < TIER_LINEAR) { l->alloc_tier = tier + 1; continue; } g_alloc_failed = 1; @@ -442,10 +494,11 @@ static int alloc_slot(struct layer *l, struct slot *s, int w, int h, uint32_t fm if (l->logged_w != w || l->logged_h != h || l->logged_fmt != fmt || l->logged_mod != mod || l->logged_tier != tier) { l->logged_w = w; l->logged_h = h; l->logged_fmt = fmt; l->logged_mod = mod; l->logged_tier = tier; - droiddeck_log("layer", "%s: pool buffers %dx%d%s: %s (%s), stride %u px, up to %d buffers (gralloc handle %d fds / %d ints)", - l->name, w, h, fmt == AHB_RGB10A2 ? " 10-bit RGBA1010102" : "", - mod == MOD_QCOM_COMPRESSED ? "UBWC (QCOM_COMPRESSED)" : "linear", tier_name(tier), - got.stride, l->pool_n, nh ? nh->numFds : -1, nh ? nh->numInts : -1); + droiddeck_log("layer", "%s: pool buffers %dx%d%s: %s (%s), stride %u px, up to %d buffers (gralloc handle %d fds / " + "%d ints), imported as %s%s%s%s", l->name, w, h, fmt == AHB_RGB10A2 ? " 10-bit RGBA1010102" : "", + mod == MOD_QCOM_COMPRESSED ? "UBWC (QCOM_COMPRESSED)" : pool_kind(mod), tier_name(tier), + got.stride, l->pool_n, nh ? nh->numFds : -1, nh ? nh->numInts : -1, path, + info[0] ? " (" : "", info, info[0] ? ")" : ""); } return 0; } @@ -814,7 +867,7 @@ int sc_layer_present(struct vkp_image *src, int scene_w, int scene_h, const stru l->first_logged = 1; droiddeck_log("layer", "presenting %dx%d game frames on their own SurfaceControl layer (%s pool, %d buffers); " "HUD and pointer stay Android views above it", sw, sh, - l->pool_modifier == MOD_QCOM_COMPRESSED ? "UBWC" : "linear", l->pool_n); + pool_kind(l->pool_modifier), l->pool_n); } vkp_signal_first_frame(); return 0; @@ -836,7 +889,7 @@ int sc_layer_present_pass(const struct vkp_draw *draws, int n, int scene_w, int l->first_logged = 1; droiddeck_log("layer", "presenting %dx%d frames on their own SurfaceControl layer (%s pool, %d buffers); " "HUD and pointer stay Android views above it", rw, rh, - l->pool_modifier == MOD_QCOM_COMPRESSED ? "UBWC" : "linear", l->pool_n); + pool_kind(l->pool_modifier), l->pool_n); } vkp_signal_first_frame(); return 0; @@ -874,12 +927,12 @@ int sc_layer_present_hdr_scene(const struct vkp_draw *draws, int n, const struct if (tm) droiddeck_log("color", "tone-mapped picture on the game's display layer: %dx%d, %s 8-bit buffers, untagged " "(sRGB) - HDR output is switched off", rw, rh, - l->pool_modifier == MOD_QCOM_COMPRESSED ? "UBWC" : "linear"); + pool_kind(l->pool_modifier)); else { char cov[96]; coverage_text(l, cov, sizeof(cov)); droiddeck_log("color", "HDR picture on its own display layer: %dx%d, %s %s buffers, tagged %s%s%s", rw, rh, - l->pool_modifier == MOD_QCOM_COMPRESSED ? "UBWC" : "linear", + pool_kind(l->pool_modifier), g_hdr_pool_fmt == AHB_RGB10A2 ? "10-bit" : "8-bit", color && color->dataspace == DROIDDECK_ADATASPACE_BT2020_PQ ? "BT2020_PQ" : "HDR", cov[0] ? ", " : "", cov); diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.c b/app/src/main/cpp/waylandcomp/src/vk_present.c index df1c0d8172..895e1f6b47 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.c +++ b/app/src/main/cpp/waylandcomp/src/vk_present.c @@ -93,6 +93,9 @@ static int g_black_state; static PFN_vkImportSemaphoreFdKHR g_import_sem_fd; static VkSemaphore g_wait_sem; +#define VKP_VENDOR_QUALCOMM 0x5143 +static uint32_t g_vendor_id; + static struct vkp_perf g_perf; static int64_t perf_now(void) { struct timespec ts; @@ -460,6 +463,7 @@ static int dev_init(void) { { VkPhysicalDeviceProperties props; g_vk.GetPhysicalDeviceProperties(g_pd, &props); + g_vendor_id = props.vendorID; snprintf(g_gpu_name, sizeof(g_gpu_name), "%s", props.deviceName); droiddeck_log("gpu", "compositor renders on %s with %s", props.deviceName, g_library_name ? g_library_name : "the system Vulkan driver"); @@ -989,8 +993,9 @@ struct vkp_image *vkp_image_import_dmabuf(int fd, uint32_t drm_format, uint64_t .allocationSize = req.size, .memoryTypeIndex = (uint32_t)idx}; VkResult mr = g_vk.AllocateMemory(g_dev, &mai, NULL, &img->mem); if (mr != VK_SUCCESS) { - LOGE("%s: importing the %s dma-buf (%dx%d, %llu bytes) -> %s", as_blit_dst ? "layer" : "dmabuf", - vkp_modifier_name(modifier), w, h, (unsigned long long)req.size, vk_result_name(mr)); + LOGE("%s: importing the %s dma-buf (%dx%d, pitch %u, offset %u, %llu bytes, memory type %d of image types " + "%#x & fd types %#x) -> %s", as_blit_dst ? "layer" : "dmabuf", vkp_modifier_name(modifier), w, h, + stride, offset, (unsigned long long)req.size, idx, req.memoryTypeBits, allowed, vk_result_name(mr)); g_vk.DestroyImage(g_dev, img->image, NULL); close(dupfd); free(img); return NULL; } VkResult br = g_vk.BindImageMemory(g_dev, img->image, img->mem, 0); @@ -1057,6 +1062,101 @@ struct vkp_image *vkp_image_from_ahb(AHardwareBuffer *ahb) { return img; } +int vkp_can_import_ahb(void) { + return dev_init() == 0 && g_vendor_id != VKP_VENDOR_QUALCOMM && g_ahb_import && + g_vk.GetAndroidHardwareBufferPropertiesANDROID; +} + +struct vkp_image *vkp_image_import_ahb(struct AHardwareBuffer *ahb, char *info, size_t info_n) { + if (info && info_n) info[0] = 0; + if (!ahb || !vkp_can_import_ahb()) return NULL; + AHardwareBuffer_Desc d; + AHardwareBuffer_describe(ahb, &d); + VkAndroidHardwareBufferFormatPropertiesANDROID fp = { + .sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID}; + VkAndroidHardwareBufferPropertiesANDROID hp = { + .sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID, .pNext = &fp}; + VkResult pr = g_vk.GetAndroidHardwareBufferPropertiesANDROID(g_dev, ahb, &hp); + if (pr != VK_SUCCESS) { + LOGE("layer: vkGetAndroidHardwareBufferPropertiesANDROID(%ux%u, AHB format %#x, usage %#llx) -> %s", d.width, + d.height, d.format, (unsigned long long)d.usage, vk_result_name(pr)); + return NULL; + } + if (fp.format == VK_FORMAT_UNDEFINED) { + LOGE("layer: the driver reports the %ux%u AHB (format %#x) as external format %#llx only: no blit target", + d.width, d.height, d.format, (unsigned long long)fp.externalFormat); + return NULL; + } + const VkImageUsageFlags usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT; + if (g_vk.GetPhysicalDeviceImageFormatProperties2) { + VkPhysicalDeviceExternalImageFormatInfo ext = { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO, + .handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID}; + VkPhysicalDeviceImageFormatInfo2 qi = { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2, .pNext = &ext, .format = fp.format, + .type = VK_IMAGE_TYPE_2D, .tiling = VK_IMAGE_TILING_OPTIMAL, .usage = usage}; + VkExternalImageFormatProperties extp = {.sType = VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES}; + VkImageFormatProperties2 ip = {.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2, .pNext = &extp}; + VkResult qr = g_vk.GetPhysicalDeviceImageFormatProperties2(g_pd, &qi, &ip); + if (qr != VK_SUCCESS || + !(extp.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT)) { + LOGE("layer: VkFormat %d as an imported AHB blit target is not supported (%s, external features %#x)", + (int)fp.format, vk_result_name(qr), extp.externalMemoryProperties.externalMemoryFeatures); + return NULL; + } + } + + struct vkp_image *img = calloc(1, sizeof(*img)); + if (!img) return NULL; + img->w = (int)d.width; img->h = (int)d.height; + img->dmabuf = 1; img->blit_dst = 1; + img->fmt = fp.format; + VkExternalMemoryImageCreateInfo extImg = { + .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO, + .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID}; + VkImageCreateInfo ici = { + .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, .pNext = &extImg, + .imageType = VK_IMAGE_TYPE_2D, .format = fp.format, .extent = {d.width, d.height, 1}, + .mipLevels = 1, .arrayLayers = 1, .samples = VK_SAMPLE_COUNT_1_BIT, + .tiling = VK_IMAGE_TILING_OPTIMAL, + .usage = usage, .sharingMode = VK_SHARING_MODE_EXCLUSIVE, .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED}; + VkResult cr = g_vk.CreateImage(g_dev, &ici, NULL, &img->image); + if (cr != VK_SUCCESS) { + LOGE("layer: vkCreateImage(AHB %ux%u, VkFormat %d) -> %s", d.width, d.height, (int)fp.format, + vk_result_name(cr)); + free(img); return NULL; + } + int idx = -1; + for (int i = 0; i < 32; i++) if (hp.memoryTypeBits & (1u << i)) { idx = i; break; } + if (idx < 0) { + LOGE("layer: no memory type can import the %ux%u AHB (memoryTypeBits 0)", d.width, d.height); + g_vk.DestroyImage(g_dev, img->image, NULL); free(img); return NULL; + } + VkImportAndroidHardwareBufferInfoANDROID imp = { + .sType = VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID, .buffer = ahb}; + VkMemoryDedicatedAllocateInfo ded = {.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO, + .pNext = &imp, .image = img->image}; + VkMemoryAllocateInfo mai = {.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, .pNext = &ded, + .allocationSize = hp.allocationSize, .memoryTypeIndex = (uint32_t)idx}; + VkResult mr = g_vk.AllocateMemory(g_dev, &mai, NULL, &img->mem); + if (mr != VK_SUCCESS) { + LOGE("layer: importing the %ux%u AHB (VkFormat %d, %llu bytes, memory type %d of memoryTypeBits %#x) -> %s", + d.width, d.height, (int)fp.format, (unsigned long long)hp.allocationSize, idx, hp.memoryTypeBits, + vk_result_name(mr)); + g_vk.DestroyImage(g_dev, img->image, NULL); free(img); return NULL; + } + VkResult br = g_vk.BindImageMemory(g_dev, img->image, img->mem, 0); + if (br != VK_SUCCESS) { + LOGE("layer: vkBindImageMemory(AHB) -> %s", vk_result_name(br)); + g_vk.FreeMemory(g_dev, img->mem, NULL); g_vk.DestroyImage(g_dev, img->image, NULL); + free(img); return NULL; + } + if (info && info_n) + snprintf(info, info_n, "VkFormat %d, %llu bytes, memory type %d of memoryTypeBits %#x", (int)fp.format, + (unsigned long long)hp.allocationSize, idx, hp.memoryTypeBits); + return img; +} + static int shm_sampled(void) { static int known; if (!known) { diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.h b/app/src/main/cpp/waylandcomp/src/vk_present.h index 5cc06ddb32..ac975c93d8 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.h +++ b/app/src/main/cpp/waylandcomp/src/vk_present.h @@ -1,6 +1,7 @@ #ifndef VK_PRESENT_H #define VK_PRESENT_H #include +#include #include void vk_present_set_driver(const char *driver_path, const char *library_name, const char *native_lib_dir); @@ -33,6 +34,9 @@ struct vkp_image *vkp_image_import_dmabuf(int fd, uint32_t drm_format, uint64_t int w, int h, uint32_t stride, uint32_t offset, int as_blit_dst); int vkp_image_is_dmabuf(const struct vkp_image *img); +struct AHardwareBuffer; +int vkp_can_import_ahb(void); +struct vkp_image *vkp_image_import_ahb(struct AHardwareBuffer *ahb, char *info, size_t info_n); struct vkp_image *vkp_image_create_shm(int w, int h); struct AHardwareBuffer; diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt index 344aa7452a..200deb55aa 100644 --- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt +++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt @@ -65,7 +65,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl } fun state() = GpuDriversState( - gpuName = gpu.displayName(activity), gpuFamily = gpu.family.label(activity), soc = gpu.soc, supportText = gpu.supportText(activity), + gpuName = gpu.displayName(activity), gpuFamily = gpu.family.label(activity), soc = gpu.soc, supportText = gpu.supportText(activity, com.droiddeck.launcher.core.DeviceSupport.vkBridge(activity)), supported = gpu.support == GpuInfo.Support.TESTED, unsupported = gpu.support == GpuInfo.Support.UNSUPPORTED, auto = mode == SessionPrefs.GPU_DRIVERS_AUTO, pairs = pairRows, busy = pairBusy, percent = pairPercent, autoStatus = autoStatus, releaseStatus = releaseStatus.ifEmpty { activity.getString(R.string.drivers_not_checked) }, checking = releaseChecking, @@ -264,7 +264,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl return } if (DriverPairs.recommendedKey(gpu, emptyList()) == null) { - autoStatus = activity.getString(R.string.drivers_none_to_set, gpu.supportText(activity).lowercase()) + autoStatus = activity.getString(R.string.drivers_none_to_set, gpu.supportText(activity, com.droiddeck.launcher.core.DeviceSupport.vkBridge(activity)).lowercase()) return } releaseChecking = true diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 311fd75fcc..03a1ad669d 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -163,6 +163,10 @@ class FrontEndActivity : ComponentActivity() { private var gameCores by mutableStateOf>(emptySet()) private var tuSysmem by mutableStateOf(false) private var zinkLazy by mutableStateOf(false) + private var vkBridge by mutableStateOf(false) + private var vkBridgeSafe by mutableStateOf(true) + private var bridgeProtonDxvk by mutableStateOf(false) + private val adrenoGpu by lazy { com.droiddeck.launcher.core.DeviceSupport.adreno() } private var noXalia by mutableStateOf(true) private var fastSync by mutableStateOf(false) private var syncFallback by mutableStateOf(true) @@ -496,19 +500,39 @@ class FrontEndActivity : ComponentActivity() { if (r.resultCode == RESULT_OK) InAppFilePicker.pickedPath(r.data)?.let { path -> setGameStorage(path, GameStorage.labelFor(this, path)) } } private var steamLibraries by mutableStateOf>(emptyList()) + private var foundSteamLibraries by mutableStateOf>(emptyList()) + private var allFilesAccessMissing by mutableStateOf(false) + private var steamLibraryScan = 0 private val pickSteamLibrary = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> val path = if (r.resultCode == RESULT_OK) InAppFilePicker.pickedPath(r.data) else null - if (path != null) Thread({ + if (path != null) addSteamLibrary(path) + } + + private fun addSteamLibrary(path: String) { + Thread({ val result = SteamLibraries.add(this, path) ui.post { steamLibraries = SteamLibraries.list(this) + refreshFoundSteamLibraries() refresh() - if (result is SteamLibraries.AddResult.Refused) { - android.widget.Toast.makeText(this, getString(R.string.main_storage_not_usable, result.reason), android.widget.Toast.LENGTH_LONG).show() + when { + result is SteamLibraries.AddResult.Refused -> + android.widget.Toast.makeText(this, getString(R.string.main_storage_not_usable, result.reason), android.widget.Toast.LENGTH_LONG).show() + result is SteamLibraries.AddResult.Added && result.entry.path != path -> + android.widget.Toast.makeText(this, getString(R.string.libraries_used_inner, result.entry.label), android.widget.Toast.LENGTH_LONG).show() } } }, "steam-library-add").start() } + + private fun refreshFoundSteamLibraries() { + allFilesAccessMissing = com.droiddeck.launcher.files.AllFilesAccess.missing() + val scan = ++steamLibraryScan + Thread({ + val found = SteamLibraries.found(this) + ui.post { if (scan == steamLibraryScan) foundSteamLibraries = found } + }, "steam-library-scan").start() + } private var romsDir by mutableStateOf(null) private var steamGames by mutableStateOf>(emptyList()) private var steamGamesX64 by mutableStateOf(false) @@ -1056,6 +1080,7 @@ class FrontEndActivity : ComponentActivity() { FrontEndScreen( FrontEndState( installed = installed, ready = ready, available = available?.version, removalPending = removalPending, runtimeActionsBlocked = runtimeChangesBlocked(), + vkBridge = vkBridge, vkBridgeSafe = vkBridgeSafe, bridgeProtonDxvk = bridgeProtonDxvk, adreno = adrenoGpu, shortcutPicker = shortcutPicker, shortcutLibraryScanning = shortcutLibraryScanning, gameSyncFolder = gameSyncFolder, @@ -1204,6 +1229,15 @@ class FrontEndActivity : ComponentActivity() { onInstallPackage = { id -> installPackage(id) }, onRemovePackage = { id -> removePackage(id) }, onRuntime = { onRuntimeButton() }, + onVkBridge = { on -> + SessionPrefs.setVkBridge(this, on); vkBridge = on + if (!on) com.droiddeck.launcher.session.ComponentsManager.settleAutoDxvk(this) + }, + onVkBridgeSafe = { on -> SessionPrefs.setVkBridgeSafe(this, on); vkBridgeSafe = on }, + onBridgeProtonDxvk = { on -> + SessionPrefs.setBridgeProtonDxvk(this, on); bridgeProtonDxvk = on + if (on) com.droiddeck.launcher.session.ComponentsManager.settleAutoDxvk(this) + }, onFrameGenPick = { mode -> FrameGen.set(this, mode) frameGenLabel = FrameGen.label(this) @@ -1681,6 +1715,7 @@ class FrontEndActivity : ComponentActivity() { override fun onResume() { super.onResume() + if (settingsMode == SessionService.MODE_STEAM) refreshFoundSteamLibraries() compatLaunchVisible = true com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) com.droiddeck.launcher.ui.DualScreenPanel.ownerPaused(taskId, false) @@ -2141,6 +2176,8 @@ class FrontEndActivity : ComponentActivity() { gameStorage = if (mode == SessionService.MODE_STEAM) gameStorage else null, storageOptions = storageOptions, steamLibraries = steamLibraries, + foundSteamLibraries = foundSteamLibraries, + allFilesAccessMissing = allFilesAccessMissing, storageDiagnostics = mode == SessionService.MODE_STEAM && storageDiagnostics, fexPreset = if (mode == SessionService.MODE_STEAM) fexPreset else null, forceSsbs = forceSsbs, @@ -2208,6 +2245,8 @@ class FrontEndActivity : ComponentActivity() { onAddSteamLibrary = { pickSteamLibrary.launch(InAppFilePicker.buildDirIntent(this, getString(R.string.libraries_pick), null)) }, + onAddFoundSteamLibrary = { path -> addSteamLibrary(path) }, + onAllowAllFilesAccess = { com.droiddeck.launcher.files.AllFilesAccess.open(this) }, onRenameSteamLibrary = { id, label -> SteamLibraries.rename(this, id, label) steamLibraries = SteamLibraries.list(this) @@ -2217,6 +2256,7 @@ class FrontEndActivity : ComponentActivity() { SteamLibraries.remove(this, id) steamLibraries = SteamLibraries.list(this) refresh() + refreshFoundSteamLibraries() }, onStorageDiagnostics = { on -> SessionPrefs.setStorageDiagnosticsEnabled(this, on) @@ -2453,6 +2493,7 @@ class FrontEndActivity : ComponentActivity() { refreshWifiDiscovery() gameStorage = SessionPrefs.gameStorage(this) steamLibraries = SteamLibraries.list(this) + if (mode == SessionService.MODE_STEAM) refreshFoundSteamLibraries() storageDiagnostics = SessionPrefs.storageDiagnosticsEnabled(this) settingsMode = mode Thread({ @@ -2483,6 +2524,7 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setGameStorage(this, path, label) gameStorage = path checkUsbLink() + if (settingsMode == SessionService.MODE_STEAM) refreshFoundSteamLibraries() } private fun checkUsbLink() { @@ -2506,6 +2548,9 @@ class FrontEndActivity : ComponentActivity() { gameCores = CpuCores.parse(SessionPrefs.gameCpus(this)).ifEmpty { CpuCores.all.toSet() } tuSysmem = SessionPrefs.tuSysmem(this) zinkLazy = SessionPrefs.zinkLazy(this) + vkBridge = SessionPrefs.vkBridge(this) + vkBridgeSafe = SessionPrefs.vkBridgeSafe(this) + bridgeProtonDxvk = SessionPrefs.bridgeProtonDxvk(this) noXalia = SessionPrefs.noXalia(this) fastSync = SessionPrefs.fastSync(this) syncFallback = SessionPrefs.syncFallback(this) @@ -2542,6 +2587,9 @@ class FrontEndActivity : ComponentActivity() { offline = OfflineMode.enabled(this) installed = LinuxRuntimeInstaller.installedVersion(this) ready = LinuxRuntime.isInstalled(this) + vkBridge = SessionPrefs.vkBridge(this) + vkBridgeSafe = SessionPrefs.vkBridgeSafe(this) + bridgeProtonDxvk = SessionPrefs.bridgeProtonDxvk(this) removalPending = LinuxRuntimeInstaller.hasRemovalPending(this) ui.post { autoUpdateRuntime() } frameGenLabel = FrameGen.label(this) @@ -2646,7 +2694,7 @@ class FrontEndActivity : ComponentActivity() { Thread({ checkCatalog() }, "catalog").start() return } - if (installed == null && !com.droiddeck.launcher.core.DeviceSupport.adreno()) { showNonAdreno = release; return } + if (installed == null && !com.droiddeck.launcher.core.DeviceSupport.canDraw(this)) { showNonAdreno = release; return } install(release) } @@ -2665,7 +2713,7 @@ class FrontEndActivity : ComponentActivity() { showPhantomGate = true return false } - val warn = installed == null && !com.droiddeck.launcher.core.DeviceSupport.adreno() + val warn = installed == null && !com.droiddeck.launcher.core.DeviceSupport.canDraw(this) if (warn && available != null) { showNonAdreno = available; return false } startActivity(intent) return true diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index c334972670..f20ea7a7af 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -37,6 +37,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.runtime.withFrameNanos import androidx.compose.ui.Modifier +import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.unit.dp @@ -294,9 +295,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun alignCursorToGuest(): Boolean { if (pointerLocked || !CompositorHost.isStarted) return false if (!WaylandCompositor.nativeCursorInputPos(cursorPosBuf)) return false - if (surfaceView.width <= 0 || surfaceView.height <= 0) return false - val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * surfaceView.width - val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * surfaceView.height + if (outputView().width <= 0 || outputView().height <= 0) return false + val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * outputView().width + val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * outputView().height if (kotlin.math.abs(x - cursorPos.x) < 0.75f && kotlin.math.abs(y - cursorPos.y) < 0.75f) return false cursorPos = androidx.compose.ui.geometry.Offset(x, y) return true @@ -421,6 +422,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var glassesSettings by mutableStateOf(Glasses.settings.value) private var glassesScreen: GlassesScreen? = null private var glassesOutputActive by mutableStateOf(false) + private var bottomGame: com.droiddeck.launcher.ui.BottomGameScreen? = null + private var bottomOutputActive by mutableStateOf(false) + private val topDesktopKeys = mutableSetOf>() + private var bottomRecoveries = 0 + private var gameOnBottom by mutableStateOf(SessionState.gameOnBottom) + private var bottomSwapAvailable by mutableStateOf(false) private var pausedFrame by mutableStateOf(null) private var pausedFrameWanted = false private var pauseAnimated by mutableStateOf(false) @@ -477,6 +484,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var secondScreenPresentation: SecondScreenPresentation? = null private val bottomScreenListener: () -> Unit = { if (secondScreenPresentation?.display?.displayId?.let(com.droiddeck.launcher.input.DualScreen::taken) == true) closeSecondScreen(reset = false) + updateBottomGame() refreshSecondScreenDisplays() } @@ -494,6 +502,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onDisplayChanged(displayId: Int) { notifyActivityDisplayStateChanged(displayId) followPanelRefresh(displayId) + updateBottomGame() refreshSecondScreenDisplays() } } @@ -525,7 +534,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun followPanelRefresh(displayId: Int) { if (!CompositorHost.isStarted) return - val output = glassesScreen?.display + val output = bottomGame?.takeIf { bottomOutputActive }?.display ?: glassesScreen?.display ?: (if (Build.VERSION.SDK_INT >= 30) display else windowManager.defaultDisplay) ?: return if (output.displayId != displayId) return applyOutputPacing() @@ -585,6 +594,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionEvents.begin(this, mode, SessionPaths.label(mode, intent.getStringExtra(SessionService.EXTRA_PROGRAM))) SessionState.secondScreenAutoOpened = false SessionState.secondScreenProvisional = false + SessionState.gameOnBottom = false + gameOnBottom = false } if (!SessionState.running && SessionState.phase in setOf(SessionPhase.IDLE, SessionPhase.FAILED)) { SessionState.program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) @@ -844,9 +855,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { androidx.compose.runtime.DisposableEffect(Unit) { onDispose { com.droiddeck.launcher.glasses.GlassesMenuMirror.setSessionMenuVisible(this@SessionActivity, false) } } - androidx.compose.runtime.LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, pipUi) { updatePointerCapture() } + androidx.compose.runtime.LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, pipUi, bottomOutputActive) { updatePointerCapture() } + androidx.compose.runtime.LaunchedEffect(bottomOutputActive) { hud.setHidden(pipUi || bottomOutputActive) } androidx.compose.runtime.LaunchedEffect(pipUi) { - hud.setHidden(pipUi) + hud.setHidden(pipUi || bottomOutputActive) applyOutputPacing() if (pipUi != frameGenPip) { frameGenPip = pipUi @@ -882,10 +894,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } else { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) { - CursorOverlay({ cursorPos }, cursorVisible && !uiPointer, + CursorOverlay({ cursorPos }, cursorVisible && !uiPointer && !bottomOutputActive, resources.displayMetrics.density, cursorImage, cursorHotX, cursorHotY, cursorImageScale) if (memoryHud.text.isNotEmpty()) HudText(memoryHud.text, hudColor, hudOpacity) + if (bottomOutputActive && !loading.visible) SwappedTopPanel() val phonePanel = glassesOutputActive && !loading.visible && !drawerOpen && !pcKeyboardOpen if (phonePanel) GlassesPhonePanel(glasses, steamVrStatus == SteamVr.Status.RUNNING, headTracking) if (trackingRecovery != null && !drawerOpen && !pcKeyboardOpen && !loading.visible) { @@ -1192,6 +1205,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { touchAuto = getString(if (usingTouchpad()) R.string.session_touch_auto_touchpad else R.string.session_touch_auto_direct), fexPreset = fexPreset, secondScreenMode = secondScreenMode, + gameOnBottom = bottomOutputActive, + gameSwapAvailable = bottomSwapAvailable, + onGameOnBottom = { on -> drawerOpen = false; putGameOnBottom(on) }, dashboardAvailable = bottomPages().isNotEmpty(), desktopAvailable = com.droiddeck.launcher.session.BottomDesktop.available(), secondScreenDisplays = secondScreenDisplays, @@ -1928,7 +1944,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } if (problem == null) SessionEvents.record("package.ready") else failedComponent = "package" } - if (problem == null && desktop && !SessionState.stopRequested) { + if (problem == null && desktop && !SessionState.stopRequested && + !((runtime || resume) && com.droiddeck.launcher.runtime.DesktopCatalog.desktopInstalled(this))) { if (activeInstallWorker === worker) SessionState.installing = "desktop" SessionEvents.transition(SessionPhase.INSTALLING_RUNTIME, "desktop.installing", mapOf("component" to "desktop")) problem = installDesktop() @@ -2073,7 +2090,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val live = windowOutputSize(holder.surfaceFrame.width(), holder.surfaceFrame.height()) val size = live ?: if (SessionState.running) previous else glassesOutputSize() ?: outputSize() SessionState.outputSize = size - if (!SessionState.running) SessionState.refreshHz = refreshHz() + if (!SessionState.running) SessionState.refreshHz = refreshHz(holder) val panel = panelBounds() SessionState.upscaleRatio = maxOf(panel.width(), panel.height()).toFloat() / maxOf(size.first, size.second).coerceAtLeast(1) Thread({ @@ -2123,7 +2140,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { CompositorHost.startOrAttach( this, holder.surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, - applicationInfo.nativeLibraryDir, size.first, size.second, refreshHz(), outputFpsLimit(), + applicationInfo.nativeLibraryDir, size.first, size.second, refreshHz(holder), outputFpsLimit(), ) onOutputAttached(holder) if (SessionState.running && size != previous) { @@ -2165,6 +2182,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun windowOutputSize(width: Int, height: Int): Pair? { if (isInPictureInPictureMode || width <= 0 || height <= 0) return null + if (bottomGame != null) return when { + SessionState.followScreen -> + com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, false, SessionState.followScale) + resolutionChoice() == com.droiddeck.launcher.session.SessionDisplay.MATCH_SCREEN -> + (width and 1.inv()) to (height and 1.inv()) + else -> null + } return if (SessionState.followScreen) com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, controlsBelowWanted(), SessionState.followScale) else if (glassesScreen == null) outputSize() else null @@ -2211,12 +2235,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun surfaceDestroyed(holder: SurfaceHolder) { if (holder !== outputHolder()) return - cancelTouchGestures() + cancelOutputTouches() surfaceW = 0 surfaceH = 0 glassesOutputActive = false + bottomOutputActive = false if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(false) CompositorHost.detach(holder.surface) + bottomGame?.takeIf { it.holder === holder }?.let { screen -> uiHandler.post { recoverBottomOutput(screen) } } } private fun cancelTouchGestures() { @@ -2239,19 +2265,24 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun displayMode(): String = SessionPrefs.displayMode(this, intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM, intent.getStringExtra(SessionService.EXTRA_PROGRAM)) - private fun outputSize(): Pair { + private fun outputSize(): Pair = + com.droiddeck.launcher.session.SessionDisplay.resolveChoice(com.droiddeck.launcher.session.SessionDisplay.panelSize(this), + resolutionChoice(), SessionPrefs.portrait(this) && !controlsBelowWanted()) + + private fun resolutionChoice(): String { val mode = displayMode() - val panel = com.droiddeck.launcher.session.SessionDisplay.panelSize(this) val program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) - val choice = if (intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_RUN && + return if (intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_RUN && Library.drawsAtPanel(program) && !SessionPrefs.resolutionChosen(this, mode)) com.droiddeck.launcher.session.SessionDisplay.MATCH_SCREEN - else SessionPrefs.resolutionChoice(this, mode, panel) - return com.droiddeck.launcher.session.SessionDisplay.resolveChoice(panel, choice, - SessionPrefs.portrait(this) && !controlsBelowWanted()) + else SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) } - private fun refreshHz(): Float { + private fun refreshHz(): Float = refreshHz(null) + + private fun refreshHz(holder: SurfaceHolder?): Float { + bottomGame?.takeIf { if (holder != null) holder === it.holder else bottomOutputActive } + ?.hz?.takeIf { it > 1f }?.let { return minOf(it, PerfMode.peakRefreshCap(this)) } glassesScreen?.hz?.takeIf { it > 1f }?.let { return it } val display = if (Build.VERSION.SDK_INT >= 30) display else windowManager.defaultDisplay val wanted = window.attributes.preferredDisplayModeId @@ -2600,6 +2631,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return true } if ((pcKeyboardOpen || achievementsOpen) && fromController) return super.dispatchKeyEvent(event) + if (!fromController && event.keyCode != KeyEvent.KEYCODE_BACK && sendToTopDesktop(event)) return true if (joyConVr?.onKeyEvent(event) == true) return true if (fromController && event.keyCode != KeyEvent.KEYCODE_BACK && padMouseMode() && padMouse.onKey(event)) return true if (event.keyCode != KeyEvent.KEYCODE_BACK && padBridge?.onKeyEvent(event) == true) return true @@ -2611,6 +2643,24 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return super.dispatchKeyEvent(event) } + private fun sendToTopDesktop(event: KeyEvent): Boolean { + val key = event.deviceId to event.keyCode + val owned = if (event.action == KeyEvent.ACTION_UP) topDesktopKeys.remove(key) else topDesktopFocused() + if (!owned || !super.dispatchKeyEvent(event)) return false + if (event.action == KeyEvent.ACTION_DOWN) topDesktopKeys += key + return true + } + + private fun topDesktopFocused(): Boolean { + if (!bottomOutputActive) return false + var view: View? = currentFocus + while (view != null) { + if (view is com.droiddeck.launcher.ui.BottomDesktopPanel) return true + view = view.parent as? View + } + return false + } + override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean { if (pipUi) return true notePress(event) @@ -2750,7 +2800,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun focusDrawer(): Boolean = dockedMenu()?.focusMenu() ?: sessionOverlay.requestFocus() private fun dockDrawer(): Boolean { - if (pipUi || !started || glassesScreen != null || !::displayManager.isInitialized) return false + if (pipUi || !started || glassesScreen != null || bottomGame != null || !::displayManager.isInitialized) return false val target = com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) ?: return false if (secondScreenDisplays.none { it.id == target.displayId }) return false val shown = secondScreenPresentation?.display?.displayId @@ -2865,7 +2915,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val rect = drawnRect() ?: return val cx = x.coerceIn(rect.left, rect.right) val cy = y.coerceIn(rect.top, rect.bottom) - WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, outputView().width), InputSpace.y(cy, outputView().height)) cursorVisible = false } override fun onButton(button: Int, pressed: Boolean) { @@ -2893,7 +2943,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { scrollRestY = 0f val rect = drawnRect() ?: return val x = rect.left + rect.width() * PAD_SCROLL_POINTER_X - WaylandCompositor.nativeSendPointer(1, InputSpace.x(x, surfaceView.width), InputSpace.y(rect.centerY(), surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(x, outputView().width), InputSpace.y(rect.centerY(), outputView().height)) cursorVisible = false } override fun onScroll(dx: Float, dy: Float) = scrollListener.onScroll(dx, dy) @@ -2941,10 +2991,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun placeTouchpadAtGuest(rect: android.graphics.RectF) { - if (pointerLocked || !CompositorHost.isStarted || surfaceView.width <= 0 || surfaceView.height <= 0) return + if (pointerLocked || !CompositorHost.isStarted || outputView().width <= 0 || outputView().height <= 0) return if (!WaylandCompositor.nativeCursorInputPos(cursorPosBuf)) return - val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * surfaceView.width - val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * surfaceView.height + val x = cursorPosBuf[0] / InputSpace.WIDTH.toFloat() * outputView().width + val y = cursorPosBuf[1] / InputSpace.HEIGHT.toFloat() * outputView().height if (rect.contains(x, y)) touchpad.place(x, y) } @@ -2960,7 +3010,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val rect = drawnRect() ?: return val cx = x.coerceIn(rect.left, rect.right) val cy = y.coerceIn(rect.top, rect.bottom) - WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(cx, outputView().width), InputSpace.y(cy, outputView().height)) showCursor(cx, cy) } @@ -3025,6 +3075,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { .filter { glassesScreen == null || it.id != glasses.displayId } val oldIds = secondScreenDisplays.map { it.id }.toSet() secondScreenDisplays = candidates + bottomSwapAvailable = bottomGame != null || bottomGameDisplay() != null val newIds = candidates.map { it.id }.toSet() if (secondScreenMode != SecondScreenMode.NONE && oldIds.isNotEmpty() && selectedSecondScreenDisplay !in newIds) { closeSecondScreen(reset = true) @@ -3091,7 +3142,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { closeSecondScreen(reset = false) return } - if (com.droiddeck.launcher.input.DualScreen.taken(target.displayId)) { + if (com.droiddeck.launcher.input.DualScreen.taken(target.displayId) || bottomGame?.display?.displayId == target.displayId) { if (secondScreenPresentation != null) closeSecondScreen(reset = false) secondScreenMode = mode SessionState.secondScreenMode = mode @@ -3133,6 +3184,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { menu = { DroidDeckTheme { SessionMenu(docked = true) } }, + onSwap = if (com.droiddeck.launcher.input.DualScreen.builtIn(target)) ({ putGameOnBottom(true) }) else null, dashboard = if (bottomPages().isEmpty()) null else ({ DroidDeckTheme { BottomDashboard( @@ -3141,6 +3193,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onPage = { com.droiddeck.launcher.ui.SessionBottomTab.pick(SessionState.sessionId, it) }, onClose = { selectSecondScreenMode(SecondScreenMode.NONE) }, onMenu = if (dockDrawer()) ({ drawerOpen = true }) else null, + onSwap = if (bottomSwapAvailable && com.droiddeck.launcher.input.DualScreen.builtIn(target)) ({ putGameOnBottom(true) }) else null, strip = { pageId -> com.droiddeck.launcher.ui.SessionBottomStrip(pageId) { if (::hud.isInitialized) hud.liveFps else null } }, @@ -3157,7 +3210,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { )) private fun openSettingsBelow(intent: android.content.Intent, done: () -> Boolean) { - val presentation = secondScreenPresentation ?: return + val presentation = secondScreenPresentation + if (presentation == null) { + if (!bottomOutputActive) return + listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any { + runCatching { startActivity(android.content.Intent(it)) } + .onFailure { e -> Log.w(TAG, "could not open ${it.action}", e) } + .isSuccess + } + return + } val options = android.app.ActivityOptions.makeBasic().setLaunchDisplayId(presentation.display.displayId) val opened = listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any { runCatching { startActivity(android.content.Intent(it).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK), options.toBundle()) } @@ -3188,7 +3250,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun captureScreenshot(onDone: (Boolean) -> Unit) { - val source = if (glassesOutputActive) glassesScreen?.surfaceView else if (::surfaceView.isInitialized) surfaceView else null + val source = if (glassesOutputActive) glassesScreen?.surfaceView else if (bottomOutputActive) bottomGame?.surfaceView + else if (::surfaceView.isInitialized) surfaceView else null val width = source?.width ?: 0 val height = source?.height ?: 0 if (source == null || width <= 0 || height <= 0 || source.holder.surface?.isValid != true) { @@ -3252,7 +3315,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun controlsBelowWanted(): Boolean { - if (!::sessionRoot.isInitialized || glassesScreen != null || cardboard.enabled) return false + if (!::sessionRoot.isInitialized || glassesScreen != null || bottomGame != null || cardboard.enabled) return false return SessionPrefs.controlsBelowWanted(this, SessionState.mode, sessionRoot.width, sessionRoot.height, pipUi || isInPictureInPictureMode) } @@ -3298,7 +3361,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val rect = drawnRect() ?: return val px = rect.left + nx * rect.width() val py = rect.top + ny * rect.height() - WaylandCompositor.nativeSendPointer(1, InputSpace.x(px, surfaceView.width), InputSpace.y(py, surfaceView.height)) + WaylandCompositor.nativeSendPointer(1, InputSpace.x(px, outputView().width), InputSpace.y(py, outputView().height)) showCursor(px, py) } @@ -3463,8 +3526,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun drawnRect(): android.graphics.RectF? { - val width = surfaceView.width.takeIf { it > 0 } ?: return null - val height = surfaceView.height.takeIf { it > 0 } ?: return null + val width = outputView().width.takeIf { it > 0 } ?: return null + val height = outputView().height.takeIf { it > 0 } ?: return null topPictureMapped = CompositorHost.isStarted && WaylandCompositor.nativeGamePictureRect(gamePictureBounds) if (topPictureMapped) return android.graphics.RectF( gamePictureBounds[0], gamePictureBounds[1], gamePictureBounds[2], gamePictureBounds[3]) @@ -3560,7 +3623,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val cx = x.coerceIn(rect.left, rect.right) val cy = y.coerceIn(rect.top, rect.bottom) WaylandCompositor.nativeSendTouch(action, pointerId, - InputSpace.x(cx, surfaceView.width), InputSpace.y(cy, surfaceView.height)) + InputSpace.x(cx, outputView().width), InputSpace.y(cy, outputView().height)) showCursor(cx, cy) } @@ -3624,7 +3687,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun updatePointerCapture() { if (!::surfaceView.isInitialized) return val view = window.decorView - val want = pointerLocked && resumed && hasWindowFocus() && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !pipUi && mouseAttached() + val want = pointerLocked && resumed && hasWindowFocus() && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !pipUi && !bottomOutputActive && mouseAttached() if (want == view.hasPointerCapture()) return if (want) view.requestPointerCapture() else view.releasePointerCapture() } @@ -3632,7 +3695,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var platformPointerShown: Boolean? = null private fun appUiOwnsPointer(): Boolean = - drawerOpen || pcKeyboardOpen || achievementsOpen || pipUi || glassesOutputActive + drawerOpen || pcKeyboardOpen || achievementsOpen || pipUi || glassesOutputActive || bottomOutputActive private fun applyPlatformPointer(shown: Boolean) { if (!::sessionRoot.isInitialized || !::surfaceView.isInitialized) return @@ -3855,7 +3918,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun capturePausedFrame(manual: Boolean = false) { - if (!SessionState.running || pipUi || isInPictureInPictureMode || glassesOutputActive) return + if (!SessionState.running || pipUi || isInPictureInPictureMode || glassesOutputActive || bottomOutputActive) return if (SessionState.suspended && pausedFrame != null) return if ((suspendPolicy == SessionPrefs.SUSPEND_NEVER && !manual && !SessionState.manualPause) || !::surfaceView.isInitialized) return if (surfaceView.holder.surface?.isValid != true) return @@ -3970,6 +4033,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (!inPip && surfaceW > 0) resizeOutputForWindow(surfaceW, surfaceH) applyUnfoldedControls() updateGlassesScreen() + updateBottomGame() } override fun startActivityForResult(intent: Intent, requestCode: Int, options: Bundle?) { @@ -3999,6 +4063,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionService.setActivityVisible(this, true, sessionActivityDisplayId) Glasses.rescan() updateGlassesScreen() + updateBottomGame() updateHandCamera() } @@ -4013,6 +4078,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { closeSecondScreen(reset = false) startedScreens = (startedScreens - 1).coerceAtLeast(0) updateGlassesScreen() + updateBottomGame() if (startedScreens == 0) SessionService.setActivityVisible(this, false, sessionActivityDisplayId) super.onStop() } @@ -4322,15 +4388,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { glassesScreen?.trackingRecovery?.update(trackingRecovery, glasses.sbs) } - private fun outputHolder(): SurfaceHolder = glassesScreen?.holder ?: surfaceView.holder + private fun outputHolder(): SurfaceHolder = glassesScreen?.holder ?: bottomGame?.holder ?: surfaceView.holder + + private fun outputView(): SurfaceView = bottomGame?.takeIf { bottomOutputActive }?.surfaceView ?: surfaceView private fun onOutputAttached(holder: SurfaceHolder) { if (holder !== outputHolder()) return glassesOutputActive = glassesScreen?.holder === holder - if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(glassesOutputActive) - surfaceView.visibility = if (glassesOutputActive) View.INVISIBLE else View.VISIBLE + bottomOutputActive = bottomGame?.holder === holder + if (bottomOutputActive) bottomRecoveries = 0 + if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(glassesOutputActive || bottomOutputActive) + surfaceView.visibility = if (glassesOutputActive || bottomOutputActive) View.INVISIBLE else View.VISIBLE Log.i(TAG, "compositor output attached: " + - if (glassesOutputActive) "glasses display ${glassesScreen?.display?.displayId}" else "phone") + if (glassesOutputActive) "glasses display ${glassesScreen?.display?.displayId}" + else if (bottomOutputActive) "bottom screen display ${bottomGame?.display?.displayId}" else "phone") if (pausedFrameWanted) uiHandler.postDelayed({ if (pausedFrameWanted && pausedFrame == null && resumed) capturePausedFrame() }, PAUSED_FRAME_REDRAW_MS) @@ -4348,6 +4419,140 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (surfaceView.holder.surface?.isValid == true) surfaceCreated(surfaceView.holder) } + private fun bottomGameDisplay(): Display? { + if (!::displayManager.isInitialized) return null + return com.droiddeck.launcher.input.DualScreen.sessionDisplay(this, displayManager, shownOnDisplayId) + ?.takeIf { it.isValid && com.droiddeck.launcher.input.DualScreen.builtIn(it) } + } + + private fun putGameOnBottom(on: Boolean) { + if (on && bottomGame == null && bottomGameDisplay() == null) { + android.widget.Toast.makeText(this, R.string.swap_screens_unavailable, android.widget.Toast.LENGTH_SHORT).show() + return + } + SessionState.gameOnBottom = on + gameOnBottom = on + Log.i(TAG, "game screen: " + if (on) "bottom" else "top") + updateBottomGame() + } + + private fun updateBottomGame() { + if (!::surfaceView.isInitialized) return + val target = bottomGameDisplay() + val want = com.droiddeck.launcher.ui.GameScreenSwap.wanted( + requested = gameOnBottom, + activityStarted = started && !runtimeRemovalBlocked, + sessionEnded = ended, + inPip = pipUi || isInPictureInPictureMode, + glassesOutput = glassesScreen != null, + bottomScreenFree = target != null, + ) + val shown = if (want) target else null + val current = bottomGame + if (current != null && current.display.displayId == shown?.displayId) return + if (current != null || shown != null) cancelOutputTouches() + if (current != null) { + restoreTopOutput(current) + runCatching { current.dismiss() } + } + if (shown != null) { + closeSecondScreen(reset = false) + val screen = com.droiddeck.launcher.ui.BottomGameScreen(this, shown, this, ::onBottomGameTouch) + bottomGame = screen + surfaceW = 0 + surfaceH = 0 + screen.setOnDismissListener { + if (bottomGame === screen) { + restoreTopOutput(screen) + refreshSecondScreenDisplays() + } + } + try { + screen.show() + } catch (e: Exception) { + restoreTopOutput(screen) + runCatching { screen.dismiss() } + Log.w(TAG, "could not show the game on ${shown.name}", e) + } + if (bottomGame === screen) Log.i(TAG, "requested game output on the bottom screen (display ${shown.displayId})") + } + refreshSecondScreenDisplays() + } + + private fun cancelOutputTouches() { + cancelTouchGestures() + if (::directTouchHold.isInitialized) directTouchHold.cancel() + if (::twoFingerGestures.isInitialized) twoFingerGestures.cancel() + if (CompositorHost.isStarted && deliversTouches(routedTouchMode)) WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + } + + private fun recoverBottomOutput(screen: com.droiddeck.launcher.ui.BottomGameScreen) { + if (bottomGame !== screen || bottomOutputActive || !started || screen.holder.surface?.isValid == true) return + Log.i(TAG, "bottom screen surface gone - game back on the top screen") + restoreTopOutput(screen) + runCatching { screen.dismiss() } + refreshSecondScreenDisplays() + if (++bottomRecoveries <= BOTTOM_RECOVERY_TRIES) uiHandler.postDelayed({ updateBottomGame() }, BOTTOM_RECOVERY_MS) + } + + private fun restoreTopOutput(screen: com.droiddeck.launcher.ui.BottomGameScreen) { + if (bottomGame !== screen) return + bottomGame = null + bottomOutputActive = false + surfaceW = 0 + surfaceH = 0 + CompositorHost.detach(screen.holder.surface) + if (glassesScreen != null) return + surfaceView.visibility = View.VISIBLE + applyOutputPacing() + if (surfaceView.holder.surface?.isValid == true) surfaceCreated(surfaceView.holder) + } + + private fun onBottomGameTouch(event: MotionEvent): Boolean { + if (pipUi) return true + if (!event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) return false + notePress(event) + if (event.actionMasked == MotionEvent.ACTION_DOWN) { + drawerControllerActive = false + gestureTouchStreamGate.reset() + } + if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SURFACE, event)) return false + return onTouchEvent(event) + } + + @androidx.compose.runtime.Composable + private fun SwappedTopPanel() { + val pages = bottomPages() + val swapBack = { putGameOnBottom(false) } + androidx.compose.foundation.layout.Box( + Modifier.fillMaxSize().background(androidx.compose.material3.MaterialTheme.colorScheme.background) + .pointerInput(Unit) { awaitPointerEventScope { while (true) awaitPointerEvent() } }, + ) { + if (secondScreenMode == SecondScreenMode.DESKTOP && com.droiddeck.launcher.session.BottomDesktop.available()) { + androidx.compose.ui.viewinterop.AndroidView( + factory = { context -> + com.droiddeck.launcher.ui.BottomDesktopPanel(context, null, { drawerOpen = true }, + (({ tapSteamButton() }) to ({ tapQam() })).takeIf { SessionState.mode == SessionService.MODE_STEAM }, swapBack, + fullResolution = true) + }, + modifier = Modifier.fillMaxSize(), + ) + } else if (pages.isNotEmpty()) BottomDashboard( + pages, com.droiddeck.launcher.ui.SessionBottomTab.picked(SessionState.sessionId), + gameStarts = gameStarts, + onPage = { com.droiddeck.launcher.ui.SessionBottomTab.pick(SessionState.sessionId, it) }, + onClose = null, + onMenu = { drawerOpen = true }, + onSwap = swapBack, + strip = { pageId -> + com.droiddeck.launcher.ui.SessionBottomStrip(pageId) { if (::hud.isInitialized) hud.liveFps else null } + }, + ) else androidx.compose.material3.Button(onClick = swapBack, modifier = Modifier.align(androidx.compose.ui.Alignment.Center)) { + androidx.compose.material3.Text(getString(R.string.swap_screens)) + } + } + } + private fun glassesOutputSize(): Pair? { if (glassesScreen == null || glasses.width <= 0 || glasses.height <= 0) return null val panel = (if (glasses.sbs) glasses.width / 2 else glasses.width) to glasses.height @@ -4405,6 +4610,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { runCatching { current.dismiss() } } if (target != null) { + bottomGame?.let { restoreTopOutput(it); runCatching { it.dismiss() } } val screen = GlassesScreen(this, target, Glasses.outputHz(), this, Glasses.outputResolution()) glassesScreen = screen applyOutputPacing() @@ -4430,6 +4636,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { applyOutputPacing() refreshSecondScreenDisplays() applyCardboard(cardboard) + if (target == null) updateBottomGame() } private fun onGlassesSteamVr(now: SteamVr.Status) { @@ -4541,6 +4748,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { closeSecondScreen(reset = false) glassesScope.cancel() glassesScreen?.let { screen -> glassesScreen = null; runCatching { screen.dismiss() } } + bottomGame?.let { screen -> bottomGame = null; runCatching { screen.dismiss() } } headTracker?.stop() if (::hud.isInitialized) hud.stop() if (::memoryHud.isInitialized) memoryHud.stop() @@ -4626,6 +4834,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val PAUSED_FRAME_REDRAW_MS = 150L private const val SETTINGS_WATCH_MS = 1_000L private const val SETTINGS_WATCH_CHECKS = 600 + private const val BOTTOM_RECOVERY_MS = 1_000L + private const val BOTTOM_RECOVERY_TRIES = 3 private const val TAG = "SessionActivity" private var startedScreens = 0 @Volatile private var activeInstallWorker: Any? = null diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt index 3a40300dce..309716d3fc 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -208,7 +208,7 @@ object DeviceReport { h("Drivers") val gpu = com.droiddeck.launcher.gpu.GpuInfo.detect() - k("GPU", "${gpu.name} · ${gpu.family.label} · ${gpu.supportText}" + if (gpu.oneUi8Gen2) " · One UI 8 Gen 2" else "") + k("GPU", "${gpu.name} · ${gpu.family.label} · ${gpu.supportText(SessionPrefs.vkBridge(context))}" + if (gpu.oneUi8Gen2) " · One UI 8 Gen 2" else "") if (gpu.model == 740) { val hint = com.droiddeck.launcher.gpu.TpUbwcHint k("TP UBWC hint", hint.forThisDevice(context) ?: "driver default") diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceSupport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceSupport.kt index 325ed7d43d..ee214fedfe 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceSupport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceSupport.kt @@ -6,8 +6,20 @@ import com.droiddeck.launcher.R import java.io.File object DeviceSupport { - fun adreno(): Boolean = + private val adrenoGpu by lazy { File("/sys/class/kgsl/kgsl-3d0").exists() || File("/vendor/lib64/hw/vulkan.adreno.so").exists() + } + + private val maliGpu by lazy { !adrenoGpu && File("/dev/mali0").exists() } + + fun adreno(): Boolean = adrenoGpu + + fun mali(): Boolean = maliGpu + + fun vkBridge(context: Context): Boolean = + !adreno() && com.droiddeck.launcher.session.SessionPrefs.vkBridge(context) + + fun canDraw(context: Context): Boolean = adreno() || vkBridge(context) fun gpuName(context: Context): String { val soc = if (Build.VERSION.SDK_INT >= 31) Build.SOC_MODEL.takeIf { it.isNotBlank() && it != Build.UNKNOWN } else null diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/AppVulkan.kt b/app/src/main/java/com/droiddeck/launcher/gpu/AppVulkan.kt new file mode 100644 index 0000000000..59818f263d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/gpu/AppVulkan.kt @@ -0,0 +1,73 @@ +package com.droiddeck.launcher.gpu + +import android.content.Context +import android.util.Log +import com.droiddeck.launcher.core.DeviceSupport +import com.droiddeck.launcher.core.FileUtils +import java.io.File + +data class AppVulkan( + val major: Int, + val minor: Int, + val shaderInt64: Boolean?, + val maxPushConstants: Int?, + val source: String, +) { + fun atLeast(major: Int, minor: Int): Boolean = this.major > major || (this.major == major && this.minor >= minor) + + val label: String + get() = "Vulkan $major.$minor, shaderInt64 ${shaderInt64?.let { if (it) "yes" else "no" } ?: "?"}, " + + "push constants ${maxPushConstants ?: "?"} ($source)" + + companion object { + private const val TAG = "AppVulkan" + const val BRIDGE_FILE = "apps-vulkan" + + fun detect(context: Context): AppVulkan? { + if (!DeviceSupport.vkBridge(context)) return null + val native = VulkanInfo.query() + val file = File(VkBridgeComponent.cacheDir(context), BRIDGE_FILE) + val fromBridge = FileUtils.readString(file)?.let { fromBridgeFile(it, native["device"], native["api"]) } + val found = fromBridge ?: fromDriver(native) + Log.i(TAG, found?.label ?: "unknown (driver query: ${native["error"] ?: "no api line"})") + return found + } + + internal fun fromBridgeFile(text: String, driverDevice: String?, driverApi: String? = null): AppVulkan? { + val map = keyValues(text) + val device = map["device"] + if (device != null && driverDevice != null && device != driverDevice) return null + val fileDriver = version(map["driver_api"]) + val native = version(driverApi) + if (fileDriver != null && native != null && fileDriver != native) return null + val promoted = map["promotion"]?.trim()?.lowercase() == "on" + val (major, minor) = (if (promoted) version(map["api"]) else fileDriver ?: version(map["api"])) ?: return null + return AppVulkan(major, minor, bool(map["shader_int64"]), map["max_push_constants"]?.toIntOrNull(), + if (promoted) "bridge, promoted" else "bridge") + } + + internal fun fromDriver(map: Map): AppVulkan? { + val (major, minor) = version(map["api"]) ?: return null + return AppVulkan(major, minor, bool(map["shader_int64"]), map["max_push_constants"]?.toIntOrNull(), "driver") + } + + private fun keyValues(text: String): Map = text.lineSequence().mapNotNull { line -> + val eq = line.indexOf('=') + if (eq <= 0) null else line.substring(0, eq).trim() to line.substring(eq + 1).trim() + }.toMap() + + private fun version(v: String?): Pair? { + val parts = v?.trim()?.split('.') ?: return null + if (parts.size < 2) return null + val major = parts[0].toIntOrNull() ?: return null + val minor = parts[1].toIntOrNull() ?: return null + return major to minor + } + + private fun bool(v: String?): Boolean? = when (v?.trim()?.lowercase()) { + "1", "yes", "true" -> true + "0", "no", "false" -> false + else -> null + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt b/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt new file mode 100644 index 0000000000..8385deaafa --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt @@ -0,0 +1,108 @@ +package com.droiddeck.launcher.gpu + +import android.content.Context +import android.os.Build +import android.os.PowerManager +import android.util.Log +import com.droiddeck.launcher.core.SessionPart +import java.io.File +import java.io.FileWriter +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale + +class ClockLogComponent(private val logFile: File) : SessionPart() { + @Volatile private var running = false + private var thread: Thread? = null + + override fun start() { + running = true + thread = Thread({ run() }, "clock-log").apply { isDaemon = true; start() } + } + + override fun stop() { + running = false + thread?.interrupt() + thread = null + } + + private fun run() { + val policies = File("/sys/devices/system/cpu/cpufreq").listFiles { f -> f.name.startsWith("policy") } + ?.sortedBy { it.name.removePrefix("policy").toIntOrNull() ?: 0 } ?: emptyList() + val gpuCandidates = gpuSources() + val gpu = gpuCandidates.firstOrNull { !it.startsWith("/proc/") && firstNumber(it) != null } + val power = app().getSystemService(Context.POWER_SERVICE) as? PowerManager + val time = SimpleDateFormat("HH:mm:ss", Locale.US) + try { + FileWriter(logFile, true).use { w -> + w.write("== clocks: ${Build.MANUFACTURER} ${Build.MODEL} (${Build.HARDWARE}), every ${PERIOD_MS / 1000}s\n") + w.write("cpu policies: ${policies.joinToString { p -> p.name + " " + (File(p, "related_cpus").readTextOrNull()?.trim() ?: "?") }}\n") + for (source in gpuCandidates) { + val f = File(source) + val state = when { + !f.exists() -> continue + firstNumber(source) != null -> "readable" + else -> "refused" + } + w.write("gpu source $source: $state\n") + } + w.write("gpu clock from: ${gpu ?: "nothing readable"}\n") + w.flush() + while (running && logFile.length() < MAX_BYTES) { + val line = StringBuilder(time.format(Date())) + for (p in policies) { + val cur = firstNumber(File(p, "scaling_cur_freq").path) + val max = firstNumber(File(p, "scaling_max_freq").path) + val hw = firstNumber(File(p, "cpuinfo_max_freq").path) + line.append(" ${p.name.removePrefix("policy").let { "p$it" }} ${mhz(cur)}/${mhz(max)}") + if (hw != null && max != null && max < hw) line.append("(of ${mhz(hw)})") + } + gpu?.let { line.append(" | gpu ${mhz(firstNumber(it))} MHz") } + if (power != null && Build.VERSION.SDK_INT >= 29) { + line.append(" | thermal ${power.currentThermalStatus}") + if (Build.VERSION.SDK_INT >= 30) { + val h = power.getThermalHeadroom(10) + if (!h.isNaN()) line.append(String.format(Locale.US, " headroom %.2f", h)) + } + } + w.write(line.append('\n').toString()) + w.flush() + try { Thread.sleep(PERIOD_MS) } catch (e: InterruptedException) { break } + } + } + } catch (e: Exception) { + Log.w(TAG, "clock log stopped: $e") + } + } + + companion object { + private const val TAG = "SessionService" + private const val PERIOD_MS = 2000L + private const val MAX_BYTES = 4L shl 20 + + private fun gpuSources(): List { + val list = mutableListOf( + "/sys/kernel/ged/hal/current_freqency", "/sys/kernel/ged/hal/current_frequency", + "/proc/gpufreqv2/gpufreq_status", "/proc/gpufreq/gpufreq_var_dump", + "/sys/kernel/gpu/gpu_clock", "/sys/class/misc/mali0/device/cur_freq", + "/sys/class/misc/mali0/device/clock", + ) + File("/sys/class/devfreq").list()?.sorted()?.forEach { node -> + if (node.contains("mali", true) || node.contains("gpu", true)) list.add("/sys/class/devfreq/$node/cur_freq") + } + return list.distinct() + } + + private fun File.readTextOrNull(): String? = runCatching { readText() }.getOrNull() + + private fun firstNumber(path: String): Long? = + runCatching { Regex("\\d+").find(File(path).readText())?.value?.toLong() }.getOrNull() + + private fun mhz(raw: Long?): String = when { + raw == null -> "?" + raw > 10_000_000 -> (raw / 1_000_000).toString() + raw > 10_000 -> (raw / 1_000).toString() + else -> raw.toString() + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt b/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt index 9a5fb11821..2d9aab9020 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt @@ -16,7 +16,7 @@ object DeviceInfo { val vk = VulkanInfo.query() val gpu = GpuInfo.detect() return listOf( - chip(), gpu(gpu), cpu(), memory(context), system(), vulkan(context, vk), drivers(context, gpu), + chip(), gpu(context, gpu), cpu(), memory(context), system(), vulkan(context, vk), drivers(context, gpu), ).filter { it.rows.isNotEmpty() } } @@ -51,7 +51,7 @@ object DeviceInfo { add("Family", read("/sys/devices/soc0/family")) }) - private fun gpu(gpu: GpuInfo) = Section("GPU", buildList> { + private fun gpu(context: Context, gpu: GpuInfo) = Section("GPU", buildList> { add("GPU", gpu.name) add("Family", gpu.family.label) add("Model found from", when (gpu.modelSource) { @@ -66,7 +66,7 @@ object DeviceInfo { add("Clock range", gpuRange()) add("Load", read("$kgsl/gpu_busy_percentage")?.let { if (it.endsWith("%")) it else "$it %" }) add("Temperature", read("$kgsl/temp")?.toLongOrNull()?.let { if (it > 1000) "${it / 1000} °C" else "$it °C" }) - add("Support", gpu.supportText) + add("Support", gpu.supportText(SessionPrefs.vkBridge(context))) }) private fun cpu() = Section("CPU", buildList> { diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt b/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt index c137e666fb..9b0a1897e1 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt @@ -53,6 +53,18 @@ data class GpuInfo( Support.UNSUPPORTED -> "Not supported: DroidDeck needs an Adreno (Snapdragon) GPU" } + fun supportText(bridge: Boolean): String = when { + support != Support.UNSUPPORTED -> supportText + bridge -> "Runs through the Mali bridge, on the phone's own Vulkan driver" + else -> "Not supported with the Mali bridge off: Turnip needs an Adreno (Snapdragon) GPU" + } + + fun supportText(context: Context, bridge: Boolean): String = when { + support != Support.UNSUPPORTED -> supportText(context) + bridge -> context.getString(R.string.gpuinfo_bridge) + else -> context.getString(R.string.gpuinfo_bridge_off) + } + fun supportText(context: Context): String = context.getString(when (support) { Support.TESTED -> R.string.gpuinfo_supported Support.UNTESTED -> when { diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java index 9bae92e42a..ba96c3eca8 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java +++ b/app/src/main/java/com/droiddeck/launcher/gpu/TurnipDriver.java @@ -291,6 +291,10 @@ public final class TurnipDriver { } String quest = QuestExperimental.INSTANCE.defaultAndroidDriver(); if (quest != null) return quest; + if (com.droiddeck.launcher.core.DeviceSupport.INSTANCE.vkBridge(context)) { + Log.i(TAG, "Mali bridge: the compositor uses the system Vulkan driver"); + return null; + } GpuInfo gpu = gpuDetector.get(); if (gpu.getFamily() == GpuInfo.Family.NOT_ADRENO) { Log.i(TAG, "not an Adreno GPU; leaving the display driver to the system"); diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeComponent.kt b/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeComponent.kt new file mode 100644 index 0000000000..8e1c4419e7 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeComponent.kt @@ -0,0 +1,102 @@ +package com.droiddeck.launcher.gpu + +import android.content.Context +import android.os.Process +import android.util.Log +import com.droiddeck.launcher.core.HostProcess +import com.droiddeck.launcher.core.SessionPart +import java.io.File + +class VkBridgeComponent(private val socket: File, private val logFile: File) : SessionPart() { + @Volatile private var pid = -1 + @Volatile private var exited = false + + override fun start() { + stop() + val binary = File(app().applicationInfo.nativeLibraryDir, BINARY) + if (!binary.isFile) { + Log.e(TAG, "server missing at $binary; the session will have no Vulkan") + return + } + socket.parentFile?.mkdirs() + val cacheDir = cacheDir(app()) + writeMode(cacheDir, com.droiddeck.launcher.session.SessionPrefs.vkBridgeMode(app())) + if (VkBridgeNative.start(app(), socket, logFile, cacheDir)) { + Log.i(TAG, "server ready in the app's process at $socket") + return + } + socket.delete() + exited = false + val cmd = listOf(binary.absolutePath, "--socket", socket.absolutePath, "--log", logFile.absolutePath, + "--cache-dir", cacheDir.absolutePath) + .joinToString(" ") { it.replace("\\", "\\\\").replace(" ", "\\ ") } + val env = arrayOf("HOME=" + app().filesDir) + pid = HostProcess.start(cmd, env, app().filesDir, { status -> + exited = true + Log.w(TAG, "server exited with status $status") + runCatching { logFile.appendText("== vkbridge server exited with status $status\n") } + }, { line -> Log.i(TAG, line) }) + val began = System.currentTimeMillis() + val deadline = began + 15_000L + while (!socket.exists() && !exited && System.currentTimeMillis() < deadline) { + try { Thread.sleep(50L) } catch (e: InterruptedException) { Thread.currentThread().interrupt(); break } + } + val waited = System.currentTimeMillis() - began + Log.i(TAG, if (socket.exists()) "server ready (pid $pid) at $socket after $waited ms" + else "server NOT ready (pid $pid, exited=$exited) after $waited ms; see $logFile") + if (!socket.exists() && VkBridgeNative.start(app(), socket, logFile, cacheDir)) Log.i(TAG, "server ready in the app's process at $socket") + } + + override fun stop() { + if (pid > 0) { + Process.killProcess(pid) + pid = -1 + } + if (!VkBridgeNative.serving) socket.delete() + } + + override fun suspendPid(): Int = pid + + companion object { + private const val TAG = "VkBridge" + private const val CACHE_DIR = "vkbridge-pipelines" + private const val MODE_FILE = "mode" + + fun cacheDir(context: Context): File { + val dir = File(context.filesDir, CACHE_DIR) + val old = File(context.cacheDir, CACHE_DIR) + if (old.isDirectory) migrate(old, dir) + dir.mkdirs() + return dir + } + + fun writeMode(dir: File, mode: String) { + val file = File(dir, MODE_FILE) + if (runCatching { file.readText().trim() }.getOrNull() == mode) return + val tmp = File(dir, "$MODE_FILE.tmp") + runCatching { + tmp.writeText(mode + "\n") + if (!tmp.renameTo(file)) error("rename failed") + Log.i(TAG, "bridge mode: $mode") + }.onFailure { Log.w(TAG, "could not write $file: $it"); tmp.delete() } + } + + private fun migrate(old: File, dir: File) { + val moved = if (!dir.exists()) old.renameTo(dir) else false + if (!moved) { + dir.mkdirs() + old.listFiles()?.forEach { f -> + val to = File(dir, f.name) + if (to.exists()) return@forEach + if (!f.renameTo(to)) runCatching { f.copyRecursively(to, overwrite = false) } + } + old.deleteRecursively() + } + Log.i(TAG, "bridge cache moved from $old to $dir") + } + + const val BINARY = "libvkbridge_server.so" + const val GUEST_ICD = "/usr/local/share/vkbridge/droidbridge_icd.json" + const val GUEST_LIB = "/usr/local/lib/vkbridge/libvulkan_droidbridge.so" + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeNative.kt b/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeNative.kt new file mode 100644 index 0000000000..97efa7bed8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/gpu/VkBridgeNative.kt @@ -0,0 +1,49 @@ +package com.droiddeck.launcher.gpu + +import android.content.Context +import android.content.pm.ApplicationInfo +import android.util.Log +import java.io.File + +object VkBridgeNative { + private const val TAG = "VkBridge" + + @Volatile private var loaded: Boolean? = null + + private fun load(context: Context): Boolean { + loaded?.let { return it } + val ok = try { + val dev = File(context.filesDir, "vkbridge/dev/libvkbridge_jni.so") + val debuggable = context.applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0 + if (debuggable && dev.isFile) { + Log.w(TAG, "in-app server from the development override $dev") + System.load(dev.absolutePath) + } else { + System.loadLibrary("vkbridge_jni") + } + true + } catch (e: Throwable) { + Log.w(TAG, "in-app server unavailable: $e") + false + } + loaded = ok + return ok + } + + @Volatile var serving = false + private set + + fun start(context: Context, socket: File, log: File, cacheDir: File): Boolean { + if (!load(context)) return false + val ok = try { + nativeStart(socket.absolutePath, log.absolutePath, cacheDir.absolutePath) == 1 + } catch (e: Throwable) { + Log.w(TAG, "in-app server failed to start: $e") + false + } + if (ok) serving = true + return ok + } + + @JvmStatic private external fun nativeStart(socket: String, log: String, cacheDir: String): Int +} diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index 46a56ff0af..f612477f33 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -14,6 +14,8 @@ import com.droiddeck.launcher.gpu.FrameGen import com.droiddeck.launcher.gpu.GpuInfo import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.ui.Motion import com.droiddeck.launcher.wayland.WaylandCompositor import java.io.File @@ -56,7 +58,10 @@ class DroidDeckHudHost(context: Context) { if (!gpuName.isNullOrBlank()) handler.post { this@DroidDeckHudHost.gpuName = cleanGpuName(gpuName) } if (window != null && window != lastWindow) { lastWindow = window - handler.post { onPresentingWindowChanged?.invoke() } + handler.post { + onPresentingWindowChanged?.invoke() + applyShown() + } } } @@ -174,8 +179,9 @@ class DroidDeckHudHost(context: Context) { private fun applyShown() { if (!running) return val show = !hidden && !backgrounded - view?.visibility = if (show) View.VISIBLE else View.GONE - showing = show + val visible = show && SessionState.mode != SessionService.MODE_DESKTOP + view?.visibility = if (visible) View.VISIBLE else View.GONE + showing = visible if (show != polling) { polling = show if (show) Choreographer.getInstance().postFrameCallback(frameCallback) @@ -208,14 +214,20 @@ class DroidDeckHudHost(context: Context) { file }.getOrNull() + private fun sessionResolution(): String { + val (width, height) = SessionState.outputSize + return "${width}x${height}" + } + private fun refreshLabels(hud: DroidDeckHudView) { if (feed.engine.isNotBlank() && !feed.steamFocused) engine = feed.engine hud.setEngineLabel(engine) if (gpuName.isNotBlank()) hud.setGpuModel(gpuName) - hud.setResolution(if (feed.outputWidth > 0 && feed.outputHeight > 0) buildString { + val feedResolution = if (feed.outputWidth > 0 && feed.outputHeight > 0) buildString { append(feed.outputWidth).append('x').append(feed.outputHeight) if (feed.refreshMilliHz > 0) append(" @ ").append((feed.refreshMilliHz + 499) / 1000).append("Hz") - } else "") + } else "" + hud.setResolution(feedResolution.ifBlank { sessionResolution() }) val pid = feed.pid if (pid > 0 && pid != protonPid) { protonPid = pid diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index b7acc74b3b..e78249a1c1 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -125,6 +125,7 @@ class DroidDeckHudView(context: Context) : View(context) { private var accent = 0xFF1A9FFF.toInt() private var surfaceRgb = 0x121417 private var headerMark: RectF? = null + private var headerWordmark: RectF? = null private var chipRect: RectF? = null var dock = DroidDeckHudDock.NONE @@ -167,12 +168,9 @@ class DroidDeckHudView(context: Context) : View(context) { color = colGraph } private val headerPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } - private val wordmarkPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { - typeface = Typeface.create(Typeface.SANS_SERIF, Typeface.BOLD) - } - private class Glyph(val x: Float, val baseline: Float, val text: String, val color: Int, val sizePx: Float, val sans: Boolean = false, val glow: Boolean = false) { - fun moved(dx: Float, dy: Float) = Glyph(x + dx, baseline + dy, text, color, sizePx, sans, glow) + private class Glyph(val x: Float, val baseline: Float, val text: String, val color: Int, val sizePx: Float, val glow: Boolean = false) { + fun moved(dx: Float, dy: Float) = Glyph(x + dx, baseline + dy, text, color, sizePx, glow) } private class Span(val text: String, val color: Int, val sizePx: Float, val glow: Boolean = false) private class HudRow(val label: Span, val vals: List, val inline: Boolean = false) @@ -523,7 +521,7 @@ class DroidDeckHudView(context: Context) : View(context) { private fun rebuild() { glyphs.clear(); tileRects.clear(); graphRect = null - headerMark = null; chipRect = null; dPanel = null; dDividerTop = -1f; tabRect = null; stripRect = null + headerMark = null; headerWordmark = null; chipRect = null; dPanel = null; dDividerTop = -1f; tabRect = null; stripRect = null val s = snap if (s == null) { contentW = 0f; contentH = 0f; return } if (dock != DroidDeckHudDock.NONE) { buildDockTab(); return } @@ -576,24 +574,18 @@ class DroidDeckHudView(context: Context) : View(context) { private fun footerClock(): Boolean = showClockTime && size == DroidDeckHudSize.PILL - private fun measureSans(text: String, sizePx: Float): Float { wordmarkPaint.textSize = sizePx; return wordmarkPaint.measureText(text) } - private fun panelInset() = sp(8f) private fun panelLeft() = sp(13f) private fun contentLeft() = panelLeft() + sp(16f) private fun addPanelHeader(left: Float, inner: Float): Pair { - val wordPx = sp(10f); val clockPx = sp(9.5f); val gapH = sp(7f) - wordmarkPaint.textSize = wordPx - val markH = wordmarkPaint.fontMetrics.let { it.descent - it.ascent } * 0.95f + val clockPx = sp(9.5f); val gapH = sp(7f) + val wordH = sp(12f) val markTop = inner + gapH - val markLeft = left - DroidDeckMark.inkLeftFor(markH) - headerMark = RectF(markLeft, markTop, markLeft + DroidDeckMark.widthFor(markH), markTop + markH) - val midY = markTop + markH / 2f - var x = markLeft + DroidDeckMark.inkRightFor(markH) + sp(6f) - wordmarkPaint.getTextBounds("DroidDeck", 0, 9, inkRect) - glyphs.add(Glyph(x, midY - inkRect.exactCenterY(), "DroidDeck", blend(colValue), wordPx, sans = true)) - x += measureSans("DroidDeck", wordPx) + val wordW = WordmarkArt.widthFor(wordH) + headerWordmark = RectF(left, markTop, left + wordW, markTop + wordH) + val midY = markTop + wordH / 2f + var x = left + wordW if (showClockTime) { measurePaint.textSize = clockPx measurePaint.getTextBounds("0", 0, 1, inkRect) @@ -605,7 +597,7 @@ class DroidDeckHudView(context: Context) : View(context) { glyphs.add(Glyph(x, base, t, blend(colDim), clockPx)) x += measure(t, clockPx) } - dDividerTop = markTop + markH + gapH + dDividerTop = markTop + wordH + gapH return Pair(dDividerTop + max(1f, density), x) } @@ -647,7 +639,7 @@ class DroidDeckHudView(context: Context) : View(context) { } var right = panel.right for (g in glyphs) { - val paint = if (g.sans) wordmarkPaint else measurePaint + val paint = measurePaint paint.textSize = g.sizePx paint.getTextBounds(g.text, 0, g.text.length, inkRect) if (inkRect.isEmpty) continue @@ -706,6 +698,9 @@ class DroidDeckHudView(context: Context) : View(context) { contentW = max(contentW, pad + w + pad) } + private fun hasGpuStats(s: HudMetrics.Snapshot): Boolean = + s.gpuPercent != null || s.gpuTempC != null || s.gpuClockMhz != null + private fun buildFull(s: HudMetrics.Snapshot) { val rowPx = sp(12f); val unitPx = rowPx * 0.62f val pad = sp(10f); val lineGap = sp(4f); val lvGap = sp(8f) @@ -717,7 +712,7 @@ class DroidDeckHudView(context: Context) : View(context) { rows.add(HudRow(Span("DISP", colDisp, rowPx), listOf(Span(displayServer, colValue, rowPx)))) if (hdrState != DroidDeckHudHdr.NONE) rows.add(HudRow(Span("HDR", colHdr, rowPx), hdrValue(rowPx))) - if (showGPU) { + if (showGPU && hasGpuStats(s)) { val v = ArrayList() v += numUnit(s.gpuPercent?.toString(), "%", rowPx, unitPx) if (showGpuTemp) tempSpans(s.gpuTempC, HudMetrics.TempSensor.GPU, rowPx, unitPx) @@ -728,9 +723,9 @@ class DroidDeckHudView(context: Context) : View(context) { if (showCPU) { val v = ArrayList() v += numUnit(s.cpuPercent?.toString(), "%", rowPx, unitPx) + v += gap(unitPx); v += numUnit(s.cpuClockMhz?.toString(), "MHz", rowPx, unitPx) if (showCpuTemp) tempSpans(s.cpuTempC, HudMetrics.TempSensor.CPU, rowPx, unitPx) .let { if (it.isNotEmpty()) { v += gap(unitPx); v += it } } - v += gap(unitPx); v += numUnit(s.cpuClockMhz?.toString(), "MHz", rowPx, unitPx) rows.add(HudRow(Span("CPU", colCpu, rowPx), v)) } if (showVram && s.vramText() != null) @@ -807,12 +802,13 @@ class DroidDeckHudView(context: Context) : View(context) { "${fmt1(fpsAvg)} avg · ${lowText(lows.low1Fps) ?: "—"} 1%", false)) if (showFPS) tiles.add(Tile("FRAME", colDim, numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", valPx, unitPx), "${fmt1(graphMinMs)} – ${fmt1(graphMaxMs)}", false)) - if (showGPU) tiles.add(Tile("GPU", colGpu, numUnit(s.gpuPercent?.toString(), "%", valPx, unitPx), + if (showGPU && hasGpuStats(s)) tiles.add(Tile("GPU", colGpu, numUnit(s.gpuPercent?.toString(), "%", valPx, unitPx), if (showGpuTemp && s.gpuTempC != null) HudMetrics.formatTemp(s.gpuTempC.toFloat(), tempDisplay, false) else s.gpuClockMhz?.let { "${it}MHz" }, false)) if (showCPU) tiles.add(Tile("CPU", colCpu, numUnit(s.cpuPercent?.toString(), "%", valPx, unitPx), - listOfNotNull(if (showCpuTemp) s.cpuTempC?.let { HudMetrics.formatTemp(it.toFloat(), tempDisplay, false) } else null, - s.cpuClockMhz?.toString()).joinToString(" · ").ifBlank { null }, false)) + listOfNotNull(s.cpuClockMhz?.let { "${it}MHz" }, + if (showCpuTemp) s.cpuTempC?.let { HudMetrics.formatTemp(it.toFloat(), tempDisplay, false) } else null) + .joinToString(" · ").ifBlank { null }, false)) if (showVram && s.vramText() != null) tiles.add(Tile("VRAM", colVram, valueUnit(s.vramText()!!, valPx, unitPx), null, false)) if (showRAM) tiles.add(Tile("RAM", colRam, numUnit(s.ramPercent.roundToInt().toString(), "%", valPx, unitPx), "${s.ramUsedText()} / ${s.ramTotalText()}", false)) @@ -889,7 +885,7 @@ class DroidDeckHudView(context: Context) : View(context) { val gpuName = if (showGpuModel && gpuNameText().isNotBlank()) gpuModelSpans(stkPx, colDim, compact = true) else null run { val l = ArrayList() - if (showGPU) { l += Span("GPU ${s.gpuPercent ?: "—"}%", colGpu, stkPx) } + if (showGPU && s.gpuPercent != null) { l += Span("GPU ${s.gpuPercent}%", colGpu, stkPx) } if (showCPU) { if (l.isNotEmpty()) l += Span(" · ", colDim, stkPx); l += Span("CPU ${s.cpuPercent ?: "—"}%", colCpu, stkPx) } if (l.isNotEmpty()) stack.add(l) } @@ -1145,7 +1141,7 @@ class DroidDeckHudView(context: Context) : View(context) { val left = ArrayList() if (showGpuModel && gpuNameText().isNotBlank()) left.add(HudRow(Span("GPU", colGpu, rowPx), gpuModelSpans(rowPx, colValue))) - if (showGPU) { + if (showGPU && hasGpuStats(s)) { val v = ArrayList() v += numUnit(s.gpuPercent?.toString(), "%", rowPx, unitPx) if (showGpuTemp) tempSpans(s.gpuTempC, HudMetrics.TempSensor.GPU, rowPx, unitPx) @@ -1156,9 +1152,9 @@ class DroidDeckHudView(context: Context) : View(context) { if (showCPU) { val v = ArrayList() v += numUnit(s.cpuPercent?.toString(), "%", rowPx, unitPx) + v += gap(unitPx); v += numUnit(s.cpuClockMhz?.toString(), "MHz", rowPx, unitPx) if (showCpuTemp) tempSpans(s.cpuTempC, HudMetrics.TempSensor.CPU, rowPx, unitPx) .let { if (it.isNotEmpty()) { v += gap(unitPx); v += it } } - v += gap(unitPx); v += numUnit(s.cpuClockMhz?.toString(), "MHz", rowPx, unitPx) left.add(HudRow(Span("CPU", colCpu, rowPx), v)) } if (showPerCore) { @@ -1319,7 +1315,7 @@ class DroidDeckHudView(context: Context) : View(context) { stripRect?.let { drawStrip(canvas, it) } for (g in glyphs) { - val paint = if (g.sans) wordmarkPaint else drawPaint + val paint = drawPaint paint.textSize = g.sizePx paint.color = g.color if (g.glow) paint.setShadowLayer(sp(6f), 0f, 0f, withAlpha(colGraph, 217)) @@ -1327,6 +1323,7 @@ class DroidDeckHudView(context: Context) : View(context) { if (g.glow) paint.clearShadowLayer() } headerMark?.let { DroidDeckMark.draw(canvas, it.left, it.top, it.height(), blend(colValue), accent) } + headerWordmark?.let { WordmarkArt.draw(canvas, it.left, it.top, it.height(), blend(colValue), accent) } graphRect?.let { drawGraph(canvas, it) } @@ -1416,10 +1413,6 @@ class DroidDeckHudView(context: Context) : View(context) { headerPaint.color = withAlpha(accent, 90) c.drawRect(panel.left, dDividerTop, roundEdgeX(panel, dDividerTop, stroke), dividerBottom, headerPaint) } - val halfRound = dRadius >= panel.height() / 2f - 0.5f - val wmH = if (halfRound) panel.height() * 0.92f else min(panel.height(), panel.width()) * 0.55f - DroidDeckMark.draw(c, panel.right - DroidDeckMark.widthFor(wmH) - (if (halfRound) panel.height() * 0.02f else sp(10f)), - panel.centerY() - wmH / 2f, wmH, Color.argb(20, 255, 255, 255), withAlpha(accent, 20)) c.restore() if (stroke > 0f) { val h = stroke / 2f diff --git a/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt b/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt index ade7aa6563..d9fbaa4dfc 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/MangoReadings.kt @@ -1,7 +1,9 @@ package com.droiddeck.launcher.hud +import android.os.Environment import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File +import kotlin.math.roundToInt internal class MangoReadings(private val sessionDir: File, private val rootDir: File) { class Cpu(val percent: Int, val perCore: IntArray) @@ -48,6 +50,7 @@ internal class MangoReadings(private val sessionDir: File, private val rootDir: } fun cpuTempC(): Int? { + externalCpuTemp()?.let { return it } var sum = 0f var count = 0 for (zone in LinuxRuntime.cpuTempZones()) { @@ -58,6 +61,13 @@ internal class MangoReadings(private val sessionDir: File, private val rootDir: return if (count == 0) null else (sum / count).toInt() } + /** Optional ADB helper feed: /sdcard/DroidDeck/cpu-temp, written from the host while a session runs. */ + private fun externalCpuTemp(): Int? { + val file = File(Environment.getExternalStorageDirectory(), "DroidDeck/cpu-temp") + if (!file.isFile || System.currentTimeMillis() - file.lastModified() > CPU_TEMP_FRESH_MS) return null + return readFloat(file)?.takeIf { it.isFinite() && it in -20f..150f }?.roundToInt() + } + fun gpuPercent(): Int? { val feed = fresh(File(sessionDir, "sys/kgsl-3d0/perf_now")) val source = feed ?: LinuxRuntime.gpuLoadSource()?.let(::File) ?: return null @@ -92,7 +102,8 @@ internal class MangoReadings(private val sessionDir: File, private val rootDir: return Memory((total - available) * 1024, total * 1024, (swapTotal - swapFree) * 1024, swapTotal * 1024) } - fun vramBytes(): Long? = fresh(File(rootDir, VRAM_FILE), VRAM_FRESH_MS)?.let(::readLong) + /** The KGSL total DroidDeck shares with the session (GpuMemComponent). */ + fun vramBytes(): Long? = fresh(File(rootDir, VRAM_FILE), VRAM_FRESH_MS)?.let(::readLong)?.takeIf { it > 0 } fun battery(): Battery? { val dirs = File(sessionDir, "sys/power_supply").listFiles { f -> f.name.contains("BAT") }?.sortedBy { it.name } @@ -132,6 +143,7 @@ internal class MangoReadings(private val sessionDir: File, private val rootDir: const val VRAM_FILE = "run/droiddeck-hud/gpu-mem" private const val FEED_FRESH_MS = 10_000L private const val VRAM_FRESH_MS = 15_000L + private const val CPU_TEMP_FRESH_MS = 10_000L private val WHITESPACE = Regex("\\s+") private fun readLong(file: File): Long? = runCatching { file.readText().trim().toLong() }.getOrNull() diff --git a/app/src/main/java/com/droiddeck/launcher/hud/WordmarkArt.kt b/app/src/main/java/com/droiddeck/launcher/hud/WordmarkArt.kt new file mode 100644 index 0000000000..d19c7d6e51 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/hud/WordmarkArt.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.hud + +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Path +import androidx.compose.ui.graphics.asAndroidPath +import androidx.compose.ui.graphics.vector.PathParser + +internal object WordmarkArt { + const val BOX_X = 239.135f + const val BOX_Y = 120.02f + const val BOX_W = 1040.7f - 239.135f + const val BOX_H = 243.2f - 120.02f + const val MARK_SCALE = 0.527445f + + const val LEFT_HALF = "M-31.98 0H56.055V40.489A71.81 71.81 0 0 0 56.055 183.231V223.72H-31.98Z" + const val RIGHT_HALF = "M71.885 0.28A111.86 111.86 0 0 1 71.885 223.44V183.234A71.81 71.81 0 0 0 71.885 40.486Z" + const val LETTERS = + "M361.45 241.36V160.13H387.02V241.36ZM387.02 196.73 376.32 188.38Q379.5 174.17 387.02 166.31Q394.54 158.46 407.91 158.46Q413.76 158.46 418.19 160.21Q422.62 161.97 425.96 165.65L410.75 184.87Q409.08 183.03 406.57 182.03Q404.07 181.02 400.89 181.02Q394.54 181.02 390.78 184.95Q387.02 188.88 387.02 196.73" + + "ZM467.91 243.2Q455.38 243.2 445.27 237.6Q435.15 232 429.3 222.31Q423.45 212.61 423.45 200.58Q423.45 188.54 429.3 179.02Q435.15 169.49 445.18 163.89Q455.21 158.29 467.91 158.29Q480.62 158.29 490.64 163.81Q500.67 169.32 506.52 178.93Q512.37 188.54 512.37 200.58Q512.37 212.61 506.52 222.31Q500.67 232 490.64 237.6Q480.62 243.2 467.91 243.2" + + "ZM467.91 219.97Q473.43 219.97 477.61 217.54Q481.79 215.12 484.04 210.69Q486.3 206.26 486.3 200.58Q486.3 194.9 483.96 190.63Q481.62 186.37 477.52 183.95Q473.43 181.52 467.91 181.52Q462.56 181.52 458.39 183.95Q454.21 186.37 451.87 190.72Q449.53 195.06 449.53 200.75Q449.53 206.26 451.87 210.69Q454.21 215.12 458.39 217.54Q462.56 219.97 467.91 219.97" + + "ZM523.4 241.36V160.13H548.98V241.36ZM536.27 148.93Q530.26 148.93 526.33 144.84Q522.4 140.74 522.4 134.89Q522.4 128.88 526.33 124.86Q530.26 120.85 536.27 120.85Q542.29 120.85 546.13 124.86Q549.98 128.88 549.98 134.89Q549.98 140.74 546.13 144.84Q542.29 148.93 536.27 148.93ZM599.95 243.03Q588.42 243.03 579.48 237.52Q570.54 232 565.44 222.47Q560.34 212.95 560.34 200.75Q560.34 188.54 565.44 179.02Q570.54 169.49 579.48 163.97Q588.42 158.46 599.95 158.46Q608.31 158.46 615.08 161.63Q621.85 164.81 626.28 170.41Q630.71 176.01 631.21 183.2V217.46Q630.71 224.65 626.36 230.41Q622.02 236.18 615.16 239.61Q608.31 243.03 599.95 243.03" + + "ZM604.47 219.97Q609.98 219.97 613.99 217.54Q618 215.12 620.34 210.77Q622.68 206.43 622.68 200.75Q622.68 195.06 620.43 190.8Q618.17 186.54 614.08 184.03Q609.98 181.52 604.63 181.52Q599.28 181.52 595.19 184.03Q591.09 186.54 588.67 190.88Q586.25 195.23 586.25 200.75Q586.25 206.26 588.59 210.61Q590.93 214.95 595.11 217.46Q599.28 219.97 604.47 219.97" + + "ZM646.75 241.36H621.68V219.46L625.53 199.74L621.18 180.02V120.02H646.75ZM683.19 241.36V218.29H712.44Q723.13 218.29 731.16 214.03Q739.18 209.77 743.53 201.58Q747.87 193.39 747.87 182.19Q747.87 170.99 743.44 162.97Q739.01 154.95 731.07 150.6Q723.13 146.26 712.44 146.26H682.35V123.36H712.77Q726.14 123.36 737.42 127.62Q748.71 131.88 757.15 139.82Q765.59 147.76 770.18 158.54Q774.78 169.32 774.78 182.36Q774.78 195.23 770.18 206.09Q765.59 216.96 757.23 224.81Q748.87 232.67 737.59 237.01Q726.31 241.36 713.11 241.36" + + "ZM665.47 241.36V123.36H691.71V241.36ZM827.6 243.2Q814.39 243.2 804.11 237.77Q793.83 232.33 787.98 222.64Q782.13 212.95 782.13 200.75Q782.13 188.54 787.9 178.93Q793.67 169.32 803.53 163.81Q813.39 158.29 825.76 158.29Q837.79 158.29 846.98 163.47Q856.18 168.65 861.44 177.85Q866.71 187.04 866.71 198.91Q866.71 201.08 866.46 203.5Q866.21 205.93 865.54 209.1L795.51 209.27V191.72L854.67 191.55L843.64 198.91Q843.47 191.89 841.47 187.29Q839.46 182.69 835.54 180.27Q831.61 177.85 825.92 177.85Q819.91 177.85 815.48 180.61Q811.05 183.36 808.63 188.38Q806.2 193.39 806.2 200.58Q806.2 207.77 808.79 212.86Q811.38 217.96 816.15 220.72Q820.91 223.48 827.43 223.48Q833.45 223.48 838.29 221.39Q843.14 219.3 846.82 215.12L860.86 229.16Q854.84 236.18 846.32 239.69Q837.79 243.2 827.6 243.2" + + "ZM916.68 243.2Q904.15 243.2 893.95 237.68Q883.75 232.17 877.9 222.47Q872.05 212.78 872.05 200.75Q872.05 188.54 877.99 178.93Q883.92 169.32 894.12 163.81Q904.31 158.29 917.02 158.29Q926.54 158.29 934.48 161.55Q942.42 164.81 948.6 171.33L932.22 187.71Q929.38 184.53 925.62 183.03Q921.86 181.52 917.02 181.52Q911.5 181.52 907.24 183.95Q902.98 186.37 900.55 190.63Q898.13 194.9 898.13 200.58Q898.13 206.26 900.55 210.61Q902.98 214.95 907.32 217.46Q911.67 219.97 917.02 219.97Q922.03 219.97 925.96 218.21Q929.88 216.46 932.73 213.28L948.94 229.66Q942.59 236.35 934.56 239.77Q926.54 243.2 916.68 243.2" + + "ZM1010.61 241.36 982.2 199.24 1010.45 160.13H1039.03L1004.93 204.09L1005.77 193.56L1040.7 241.36ZM958.63 241.36V120.02H984.21V241.36Z" + + private fun parse(d: String): Path = PathParser().parsePathString(d).toPath().asAndroidPath() + private val letters by lazy { parse(LETTERS) } + private val leftHalf by lazy { parse(LEFT_HALF) } + private val rightHalf by lazy { parse(RIGHT_HALF) } + private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL } + + fun widthFor(height: Float): Float = height * BOX_W / BOX_H + + fun draw(canvas: Canvas, left: Float, top: Float, height: Float, inkColor: Int, ballColor: Int) { + val k = height / BOX_H + canvas.save() + canvas.translate(left, top) + canvas.scale(k, k) + canvas.translate(-BOX_X, -BOX_Y) + paint.color = inkColor + canvas.drawPath(letters, paint) + canvas.translate(239.135f, 123.36f) + canvas.scale(MARK_SCALE, MARK_SCALE) + canvas.translate(31.98f, 0f) + canvas.drawPath(leftHalf, paint) + canvas.drawPath(rightHalf, paint) + paint.color = ballColor + canvas.drawCircle(63.98f, 111.86f, 55.98f, paint) + canvas.restore() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt index f3ab1d4c6a..24959e5a24 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/PcKeys.kt @@ -51,6 +51,15 @@ val PC_KEY_ROWS: List> = listOf( val PC_MODIFIERS: Set = setOf(42, 54, 29, 97, 56, 100, 125) +// Sticky modifiers are excluded: hiding a locked modifier would leave it pressed forever. +val PC_KEY_HIDDEN_GROUPS: Map> = mapOf( + "function" to ((59..68).toSet() + setOf(1, 87, 88)), + "nav" to setOf(110, 111, 102, 107, 104, 109), + "arrows" to setOf(103, 105, 108, 106), +) + +val PC_KEY_GROUP_IDS: Map = mapOf(0 to "function", 1 to "nav", 2 to "arrows") + val PC_KEYS: Map = PC_KEY_ROWS.flatten().associateBy { it.code } fun pcKeyLabel(context: Context, code: Int): String { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt index e3a64e9628..72e77145c9 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -17,13 +17,14 @@ object BattleNet { const val PROGRAM = "/usr/local/bin/droiddeck-battlenet" - class Title(val uid: String, val name: String, val code: String, val steam: Int? = null, val shop: String? = null, val product: String? = null) + class Title(val uid: String, val name: String, val code: String, val steam: Int? = null, val shop: String? = null, val product: String? = null, val flavor: String? = null) internal val TITLES = listOf( - Title("wow", "World of Warcraft", "WoW", shop = "world-of-warcraft-midnight", product = "wow"), - Title("wow_classic", "World of Warcraft Classic", "WoWC", shop = "world-of-warcraft-burning-crusade-classic-anniversary-edition-upgrades", product = "wow_classic"), - Title("wow_classic_era", "World of Warcraft Classic", "WoWC", product = "wow_classic_era"), - Title("wow_classic_anniversary", "World of Warcraft Classic", "WoWC", product = "wow_anniversary"), + Title("wow", "World of Warcraft", "WoW", shop = "world-of-warcraft-midnight", product = "wow", flavor = "_retail_"), + Title("wow_classic", "World of Warcraft Classic", "WoWC", shop = "world-of-warcraft-burning-crusade-classic-anniversary-edition-upgrades", product = "wow_classic", flavor = "_classic_"), + Title("wow_classic_era", "World of Warcraft Classic", "WoWC", product = "wow_classic_era", flavor = "_classic_era_"), + Title("wow_classic_anniversary", "World of Warcraft Classic", "WoWC", product = "wow_anniversary", flavor = "_anniversary_"), + Title("wow_forever", "World of Warcraft: Forever", "WoWF", shop = "world-of-warcraft-forever", product = "wowf", flavor = "_forever_"), Title("diablo3", "Diablo III", "D3", shop = "diablo-iii", product = "d3"), Title("d3cn", "Diablo III", "D3CN", shop = "diablo-iii"), Title("s2", "StarCraft II", "S2", shop = "starcraft-ii", product = "s2"), @@ -58,7 +59,7 @@ object BattleNet { Title("aqua", "Avowed", "AQUA", 2457220, shop = "avowed", product = "aqua"), ) - val STORE: List get() = TITLES.distinctBy { it.code }.filter { it.uid != "d3cn" && it.code != "WoWC" } + val STORE: List<Title> get() = TITLES.distinctBy { it.code }.filter { it.uid != "d3cn" && it.code != "WoWC" && it.code != "WoWF" } fun notInstalled(title: Title, installedIds: Collection<String?>) = installedIds.mapNotNull { id -> id?.let(::title)?.code }.none { it == title.code } @@ -159,24 +160,56 @@ object BattleNet { return if (base.isNotEmpty() && id.substringAfterLast('_') in LOCALES) TITLES.firstOrNull { it.uid == base } else null } + internal fun titleForProduct(product: String): Title? { + val code = product.trim() + if (code.isEmpty()) return null + return TITLES.firstOrNull { it.product.equals(code, ignoreCase = true) } ?: TITLES.firstOrNull { it.code.equals(code, ignoreCase = true) } + } + fun games(context: Context): List<Game> { val pfx = File(prefix(context), "pfx") + val agent = runCatching { productDbInstalls(File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").readBytes()) }.getOrNull() val entries = installs( runCatching { File(pfx, "system.reg").useLines { uninstallEntries(it) } }.getOrDefault(emptyList()), - runCatching { productDbEntries(File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").readBytes()) }.getOrNull(), + agent?.map { it.uid to it.path }, ) - val found = LinkedHashMap<String, Game>() + val products = agent.orEmpty().filter { it.product.isNotEmpty() }.associate { it.uid.lowercase() to it.product } + val listed = LinkedHashMap<String, Triple<Title, String, File>>() for ((uid, path) in entries) { - val title = title(uid) + val title = title(uid) ?: products[uid.lowercase()]?.let(::titleForProduct) if (title == null) { if (uid.lowercase() !in NOT_GAMES) Log.i(TAG, "not listed: $uid (no launch code known)") continue } - if (title.code in found) continue + if (title.code in listed) continue val folder = hostFolder(context, path)?.takeIf { it.isDirectory } ?: continue - found[title.code] = Game(title.uid, title.name, title.code, folder, uid) + listed[title.code] = Triple(title, uid, folder) } - return found.values.toList() + val saved = listed.mapValues { (code, _) -> com.droiddeck.launcher.session.SessionPrefs.battleNetFolder(context, code) } + val folders = ownFolders(listed.mapValues { it.value.first to it.value.third }, saved) + return listed.map { (code, found) -> + val folder = folders.getValue(code) + if (saved[code] != folder.path) com.droiddeck.launcher.session.SessionPrefs.setBattleNetFolder(context, code, folder.path) + Game(found.first.uid, found.first.name, code, folder, found.second) + } + } + + internal fun ownFolders(games: Map<String, Pair<Title, File>>, saved: Map<String, String?>): Map<String, File> { + val out = HashMap<String, File>() + val taken = HashSet<File>() + fun options(title: Title, folder: File) = listOfNotNull(folder, title.flavor?.let { File(folder, it) }?.takeIf { it.isDirectory }) + for ((code, game) in games) { + val keep = saved[code]?.let(::File)?.takeIf { it in options(game.first, game.second) && it !in taken } ?: continue + out[code] = keep + taken.add(keep) + } + for ((code, game) in games) { + if (code in out) continue + val pick = options(game.first, game.second).firstOrNull { it !in taken } ?: game.second + out[code] = pick + taken.add(pick) + } + return games.keys.associateWith { out.getValue(it) } } internal fun installs(registry: List<Pair<String, String>>, agent: List<Pair<String, String>>?): List<Pair<String, String>> { @@ -250,17 +283,22 @@ object BattleNet { return out.toString() } - internal fun productDbEntries(bytes: ByteArray): List<Pair<String, String>>? { + internal class AgentInstall(val uid: String, val path: String, val product: String) + + internal fun productDbEntries(bytes: ByteArray): List<Pair<String, String>>? = productDbInstalls(bytes)?.map { it.uid to it.path } + + internal fun productDbInstalls(bytes: ByteArray): List<AgentInstall>? { val installs = runCatching { fields(bytes, 0, bytes.size) }.getOrNull()?.filter { it.first == 1 }?.takeIf { it.isNotEmpty() } ?: return null return installs.map { (_, start, end) -> runCatching { val install = fields(bytes, start, end) val uid = install.firstOrNull { it.first == 1 }?.let { String(bytes, it.second, it.third - it.second) } + val product = install.firstOrNull { it.first == 2 }?.let { String(bytes, it.second, it.third - it.second) }.orEmpty() val path = install.firstOrNull { it.first == 3 }?.let { s -> fields(bytes, s.second, s.third).firstOrNull { it.first == 1 } } ?.let { String(bytes, it.second, it.third - it.second) } val installed = install.firstOrNull { it.first == 4 }?.let { s -> fields(bytes, s.second, s.third).firstOrNull { it.first == 1 } } ?.let { s -> varints(bytes, s.second, s.third)[1] } - if (uid.isNullOrEmpty() || path.isNullOrEmpty() || installed == 0L) null else uid to path + if (uid.isNullOrEmpty() || path.isNullOrEmpty() || installed == 0L) null else AgentInstall(uid, path, product) }.getOrElse { return null } }.filterNotNull() } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt index e8631c1eaf..2d1a9aa401 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt @@ -200,6 +200,7 @@ object BwrapSpawner { LIB_DIRS.map { File(rootfs, "$it/$name") }.firstOrNull { it.exists() } private fun gpu(rootfs: String, root: File, env: MutableMap<String, String>): List<Bind>? { + env["VKBRIDGE_SOCKET"]?.let { sock -> if (File(sock).exists()) return bridgeGpu(rootfs, root, env, sock) } val driver = runtimeLib(rootfs, "libvulkan_freedreno.so") if (driver == null || !File("/dev/kgsl-3d0").exists()) return null if (env.containsKey("VK_ICD_FILENAMES") || env.containsKey("VK_DRIVER_FILES")) return null @@ -222,6 +223,28 @@ object BwrapSpawner { return binds } + private fun bridgeGpu(rootfs: String, root: File, env: MutableMap<String, String>, socket: String): List<Bind>? { + val driver = File(rootfs, "usr/local/lib/vkbridge/libvulkan_droidbridge.so") + if (!driver.isFile) { Log.w(TAG, "gpu: vkbridge session but no bridge ICD in the runtime"); return null } + val binds = ArrayList<Bind>() + binds.add(Bind(driver.canonicalPath, "$GPU_DIR/libvulkan_droidbridge.so")) + val sockDir = File(socket).parent ?: return null + binds.add(Bind(sockDir, sockDir)) + val icd = File(root.parentFile, "vkbridge_icd.json") + val api = runCatching { + JSONObject(File(rootfs, "usr/local/share/vkbridge/droidbridge_icd.json").readText()).getJSONObject("ICD").getString("api_version") + }.getOrNull() ?: run { Log.w(TAG, "gpu: vkbridge session but the runtime's bridge manifest is unreadable"); return null } + icd.writeText("{\"file_format_version\": \"1.0.0\", \"ICD\": {\"library_path\": \"$GPU_DIR/libvulkan_droidbridge.so\", \"api_version\": \"$api\"}}\n") + binds.add(Bind(icd.path, "$GPU_DIR/vkbridge_icd.json")) + env["VK_DRIVER_FILES"] = "$GPU_DIR/vkbridge_icd.json" + env["VK_ICD_FILENAMES"] = "$GPU_DIR/vkbridge_icd.json" + if (!env.containsKey("MESA_LOADER_DRIVER_OVERRIDE") && !env.containsKey("GALLIUM_DRIVER")) { + env["MESA_LOADER_DRIVER_OVERRIDE"] = "zink" + env["GALLIUM_DRIVER"] = "zink" + } + return binds + } + private fun preload(session: List<Bind>, rootfs: String, env: MutableMap<String, String>): List<Bind> { val libs = FileUtils.readString(File(rootfs, "etc/ld.so.preload"))?.lines() ?.map { it.trim() }?.filter { it.startsWith("/") && File(rootfs + it).isFile } ?: return emptyList() diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt index 45f07471bc..06a0348253 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt @@ -251,12 +251,36 @@ class LinuxNetworkLinkComponent( } } + private fun localDnsServers(): Pair<List<String>, List<String>> { + val active = connectivity.activeNetwork?.let { connectivity.getNetworkCapabilities(it) } + if (active?.hasTransport(NetworkCapabilities.TRANSPORT_VPN) == true) return Pair(emptyList(), emptyList()) + val servers = LinkedHashSet<String>() + val gateways = LinkedHashSet<String>() + for (network in connectivity.allNetworks) { + val capabilities = connectivity.getNetworkCapabilities(network) ?: continue + if (!capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) continue + if (!capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) && + !capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) continue + val link = connectivity.getLinkProperties(network) ?: continue + for (address in link.dnsServers) { + if (address.isLinkLocalAddress || address.isLoopbackAddress || address.isAnyLocalAddress) continue + address.hostAddress?.substringBefore('%')?.let { servers.add(it) } + } + link.routes.firstOrNull { + it.isDefaultRoute && (it.gateway as? Inet4Address)?.let { g -> !g.isLoopbackAddress && !g.isAnyLocalAddress } == true + }?.gateway?.hostAddress?.substringBefore('%')?.let { gateways.add(it) } + } + val order = compareBy<String>({ if (it.contains(':')) 1 else 0 }) + return Pair(servers.sortedWith(order), gateways.sortedWith(order)) + } + private fun writeResolver(properties: LinkProperties?) { val own = properties?.dnsServers.orEmpty() .filter { !it.isLinkLocalAddress && !it.isLoopbackAddress && !it.isAnyLocalAddress } .sortedBy { if (it is Inet4Address) 0 else 1 } .mapNotNull { it.hostAddress?.substringBefore('%') } - val servers = (own + listOf("8.8.8.8", "1.1.1.1", "2001:4860:4860::8888")).distinct().take(6) + val (discovered, gateways) = localDnsServers() + val servers = (own + discovered + listOf("8.8.8.8", "1.1.1.1", "2001:4860:4860::8888") + gateways).distinct().take(6) val text = buildString { append("# Written by the app from the device's active network; edits are overwritten.\n") for (server in servers) append("nameserver $server\n") diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java index ab5a587370..01cbf93224 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -278,10 +278,42 @@ public final class LinuxRuntime { return false; } + static final String MALI_DEVICE = "/dev/mali0"; + + static final String[] DRM_RENDER_NODES = { + "/dev/dri/renderD128", "/dev/dri/renderD129", "/dev/dri/renderD130", "/dev/dri/renderD131", + }; + + public static String gpuStandIn(Context context) { + if (new File(KGSL_DEVICE).exists()) return KGSL_DEVICE; + if (!com.droiddeck.launcher.core.DeviceSupport.INSTANCE.vkBridge(context)) return null; + return bridgeStandIn(path -> new File(path).exists()); + } + + static String bridgeStandIn(java.util.function.Predicate<String> exists) { + if (exists.test(MALI_DEVICE)) return MALI_DEVICE; + for (String node : DRM_RENDER_NODES) if (exists.test(node)) return node; + return null; + } + + public static String deviceNumbers(String path) { + try { + long dev = Os.stat(path).st_rdev; + long major = ((dev >> 8) & 0xfff) | ((dev >> 32) & ~0xfffL); + long minor = (dev & 0xff) | ((dev >> 12) & ~0xffL); + return major + ":" + minor; + } catch (ErrnoException e) { + return null; + } + } + private static void bindGpuNode(Context context, List<String> cmd) { + String standIn = gpuStandIn(context); + if (standIn == null) return; + boolean kgsl = standIn.equals(KGSL_DEVICE); StructStat st; try { - st = Os.stat(KGSL_DEVICE); + st = Os.stat(standIn); } catch (ErrnoException e) { return; } @@ -301,13 +333,14 @@ public final class LinuxRuntime { Files.write(new File(drm, "dev").toPath(), (major + ":" + minor + "\n").getBytes(StandardCharsets.UTF_8)); Files.write(new File(device, "uevent").toPath(), - "DRIVER=kgsl-3d0\nMODALIAS=platform:kgsl-3d0\n".getBytes(StandardCharsets.UTF_8)); + (kgsl ? "DRIVER=kgsl-3d0\nMODALIAS=platform:kgsl-3d0\n" : "DRIVER=mali\nMODALIAS=platform:mali\n") + .getBytes(StandardCharsets.UTF_8)); File subsystem = new File(device, "subsystem"); if (!Files.isSymbolicLink(subsystem.toPath())) { Os.symlink("/sys/bus/platform", subsystem.getPath()); } File driver = new File(device, "driver"); - if (!Files.isSymbolicLink(driver.toPath())) { + if (kgsl && !Files.isSymbolicLink(driver.toPath())) { Os.symlink("/sys/bus/platform/drivers/msm_drm", driver.getPath()); } } catch (IOException | ErrnoException e) { @@ -315,7 +348,7 @@ public final class LinuxRuntime { } bind(cmd, new File(base, "sys").getPath() + ":/sys/dev/char"); bind(cmd, dri.getPath() + ":/dev/dri"); - bind(cmd, KGSL_DEVICE + ":/dev/dri/" + node); + bind(cmd, standIn + ":/dev/dri/" + node); bindDrmClass(base, cmd, node, major + ":" + minor); } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java index 50fb07355e..21a40a92ae 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java @@ -130,7 +130,8 @@ public final class LinuxRuntimeInstaller { } if (!owner) return join(job, listener); try { - job.ok = installOnce(context.getApplicationContext(), release, new ProgressListener() { + Context app = context.getApplicationContext(); + ProgressListener progress = new ProgressListener() { @Override public void onProgress(String stage, int percent) { onProgress(Step.OTHER, stage, percent); } @@ -141,7 +142,10 @@ public final class LinuxRuntimeInstaller { job.percent = percent; for (ProgressListener l : job.listeners) l.onProgress(step, stage, percent); } - }); + }; + boolean desktop = DesktopCatalog.INSTANCE.desktopInstalled(app); + job.ok = installOnce(app, release, progress); + if (job.ok && desktop) keepDesktop(app, progress); return job.ok; } finally { synchronized (JOB_LOCK) { @@ -151,6 +155,28 @@ public final class LinuxRuntimeInstaller { } } + private static void keepDesktop(Context context, ProgressListener progress) { + String problem; + try { + problem = DesktopCatalog.INSTANCE.install(context, DesktopCatalog.INSTANCE.desktopEntry(context), progress); + } catch (RuntimeException e) { + problem = e.toString(); + } + if (problem == null) { + Log.i(TAG, "desktop installed again for the new runtime"); + return; + } + Log.w(TAG, "desktop not installed again for the new runtime: " + problem); + boolean started = false; + for (DesktopCatalog.Entry entry : DesktopCatalog.INSTANCE.interrupted(context)) { + if (DesktopCatalog.DESKTOP_ID.equals(entry.getId())) started = true; + } + if (!started) return; + String undone = DesktopCatalog.INSTANCE.removeDesktop(context, progress); + if (undone == null) Log.i(TAG, "rolled back the partial desktop install"); + else Log.w(TAG, "could not roll back the partial desktop install: " + undone); + } + public static boolean isInstalling() { synchronized (JOB_LOCK) { return running != null && !running.removal && !running.maintenance; diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt index 923ee29996..36b9c3dfdc 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BottomDesktop.kt @@ -61,7 +61,9 @@ object BottomDesktop { /** The proot to freeze with the session when it pauses. */ val suspendPid: Int get() = guestPid private var guestGeneration = 0 - private var outputSize = 0 to 0 + var outputSize = 0 to 0 + private set + private var attachedSurface: Surface? = null private var cursorShown = false /** The session generation whose launch the running compositor and guest belong to; -1 when none. */ private var owner = -1 @@ -97,16 +99,8 @@ object BottomDesktop { fun available(): Boolean = launch?.installed == true && SessionState.running && SessionState.mode != SessionService.MODE_DESKTOP - /** - * The desktop renders below the panel's resolution: about 720 pixels on the short side keeps - * Plasma's text big enough to touch and its software rendering cheap. A running desktop keeps its size. - */ - fun outputSizeFor(width: Int, height: Int): Pair<Int, Int> { - if ((state == State.STARTING || state == State.RUNNING) && outputSize.first > 0) return outputSize - if (width <= 0 || height <= 0) return 0 to 0 - val scale = maxOf(1f, Math.round(minOf(width, height) / TARGET_SHORT_SIDE * 2f) / 2f) - return ((width / scale).toInt() and 1.inv()) to ((height / scale).toInt() and 1.inv()) - } + fun outputSizeFor(width: Int, height: Int, fullResolution: Boolean = false): Pair<Int, Int> = + desktopOutputSize(width, height, fullResolution, TARGET_SHORT_SIDE) fun addListener(listener: () -> Unit) { listeners.add(listener) } @@ -148,6 +142,7 @@ object BottomDesktop { appContext = context.applicationContext owner = current.generation outputSize = width to height + attachedSurface = surface val dir = File(current.sessionDir, "bottom-desktop").apply { mkdirs() } val msg = Message.obtain(null, Comp.MSG_ATTACH).apply { arg1 = owner @@ -169,7 +164,19 @@ object BottomDesktop { } } - fun detach() { + fun resize(surface: Surface, width: Int, height: Int) { + if (surface !== attachedSurface || width <= 0 || height <= 0 || outputSize == (width to height)) return + outputSize = width to height + pendingAttach?.data?.apply { + putInt(Comp.KEY_WIDTH, width) + putInt(Comp.KEY_HEIGHT, height) + } + service?.let { send(it, Message.obtain(null, Comp.MSG_RESIZE, width, height)) } + } + + fun detach(surface: Surface? = null) { + if (surface != null && attachedSurface != null && surface !== attachedSurface) return + attachedSurface = null pendingAttach = null service?.let { send(it, Message.obtain(null, Comp.MSG_DETACH)) } } @@ -351,3 +358,9 @@ object BottomDesktop { }, "bottom-desktop-start").start() } } + +internal fun desktopOutputSize(width: Int, height: Int, fullResolution: Boolean, targetShortSide: Float): Pair<Int, Int> { + if (width <= 0 || height <= 0) return 0 to 0 + val scale = if (fullResolution) 1f else maxOf(1f, Math.round(minOf(width, height) / targetShortSide * 2f) / 2f) + return ((width / scale).toInt() and 1.inv()) to ((height / scale).toInt() and 1.inv()) +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index b1d70902a8..8255209d19 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -7,6 +7,7 @@ import android.util.Log import com.droiddeck.launcher.core.Downloader import com.droiddeck.launcher.core.FileUtils import com.droiddeck.launcher.core.GameEnvironment +import com.droiddeck.launcher.gpu.AppVulkan import com.droiddeck.launcher.gpu.GpuInfo import com.droiddeck.launcher.runtime.LinuxRuntime import com.github.luben.zstd.ZstdInputStream @@ -638,29 +639,31 @@ object ComponentsManager { } - fun swap(context: Context, protonId: String, file: String): String = synchronized(lock) { + fun swap(context: Context, protonId: String, file: String, auto: Boolean = false): String = synchronized(lock) { val p = proton(context, protonId) val wcp = File(packagesDir(context), safeName(file)) val info = packageInfo(context, wcp) val state = loadState(context) if (inUse(context, p)) { - state.sub("queued").sub(p.id).put(info.comp, JSONObject().put("kind", "package").put("file", wcp.name).put("label", info.version)) + state.sub("queued").sub(p.id).put(info.comp, JSONObject().put("kind", "package").put("file", wcp.name).put("label", info.version) + .apply { if (auto) put("auto", true) }) saveState(context, state) return context.getString(R.string.cmgr_swap_queued, LABEL[info.comp], info.version, p.name) } - applyPackage(context, p, info, wcp, state) + applyPackage(context, p, info, wcp, state, auto) state.sub("queued").optJSONObject(p.id)?.remove(info.comp) saveState(context, state) context.getString(R.string.cmgr_swap_done, LABEL[info.comp], info.version, p.name) } - private fun applyPackage(context: Context, p: Proton, info: Package, wcp: File, state: JSONObject) { + private fun applyPackage(context: Context, p: Proton, info: Package, wcp: File, state: JSONObject, auto: Boolean = false) { ensureOriginal(context, p, info.comp, state) val hashes = installFiles(context, p.dir, info.comp, wcp) state.sub("active").sub(p.id).put(info.comp, JSONObject() .put("file", wcp.name).put("label", info.version).put("protonVersion", p.version) .put("files", JSONObject(hashes.filterKeys { owned(info.comp, it) } as Map<*, *>)) - .put("at", System.currentTimeMillis() / 1000)) + .put("at", System.currentTimeMillis() / 1000) + .apply { if (auto) put("auto", true) }) Log.i(TAG, "swapped ${info.comp} ${info.version} into ${p.name} ${p.version}") } @@ -708,7 +711,7 @@ object ComponentsManager { applyOriginal(context, p, comp, v, File(originalsDir(context), "$pid/${safeName(v)}/$comp.wcp"), state) } else { val wcp = File(packagesDir(context), q.optString("file")) - applyPackage(context, p, packageInfo(context, wcp), wcp, state) + applyPackage(context, p, packageInfo(context, wcp), wcp, state, q.optBoolean("auto")) } done += "${LABEL[comp]} ${q.optString("label")} → ${p.name}" }.onFailure { Log.w(TAG, "queued $comp for ${p.name}", it) } @@ -1011,15 +1014,76 @@ object ComponentsManager { internal fun forcedPackageWanted(activeFile: String?, protonVersionMatches: Boolean): Boolean = activeFile.isNullOrEmpty() || !protonVersionMatches + internal fun bridgeDxvk(vk: AppVulkan?): ForcedPackage? = when { + vk == null -> null + !vk.atLeast(1, 1) -> null + !vk.atLeast(1, 3) -> ForcedPackage(emptySet(), "dxvk", DXVK_FOR_VULKAN_1_1, "Dxvk-Linux") + vk.shaderInt64 == false || (vk.maxPushConstants ?: 256) < 256 -> + ForcedPackage(emptySet(), "dxvk", DXVK_FOR_VULKAN_1_3_NO_INT64, "Dxvk-Linux") + else -> null + } + + internal const val DXVK_FOR_VULKAN_1_1 = "dxvk-1.10.3-linux.wcp" + internal const val DXVK_FOR_VULKAN_1_3_NO_INT64 = "dxvk-2.6.2-linux.wcp" + + internal fun autoDxvkUndoWanted(bridgeSession: Boolean, keepProtonDxvk: Boolean, vulkan: AppVulkan?, bridgeRule: ForcedPackage?): Boolean = + !bridgeSession || keepProtonDxvk || (vulkan != null && bridgeRule == null) + + private fun dropQueuedAuto(context: Context, installed: List<Proton>) = synchronized(lock) { + val state = loadState(context) + var changed = false + for (p in installed) { + val q = state.optJSONObject("queued")?.optJSONObject(p.id) ?: continue + if (q.optJSONObject("dxvk")?.optBoolean("auto") == true) { q.remove("dxvk"); changed = true } + } + if (changed) saveState(context, state) + } + + internal fun autoChoiceStale(entry: JSONObject?, wantedFile: String?): Boolean = + entry != null && entry.optBoolean("auto") && entry.optString("file") != wantedFile + internal fun catalogMatch(items: List<CatalogItem>, file: String, release: String): CatalogItem? = items.firstOrNull { it.file == file && it.release == release } - fun ensureForcedPackages(context: Context): String? = ensureForcedPackages( + private val forcedLock = Any() + + fun ensureForcedPackages(context: Context): String? = synchronized(forcedLock) { ensureForcedPackages( context, GpuInfo.detect(), { file, release -> catalogItem(context, file, release) }, { download(context, it) {} }, { id, file -> swap(context, id, file) }, - ) + vulkan = AppVulkan.detect(context), + bridgeSession = com.droiddeck.launcher.core.DeviceSupport.vkBridge(context), + applyAuto = { id, file -> swap(context, id, file, auto = true) }, + undoAuto = { id, comp -> undoAutoChoice(context, id, comp) }, + keepProtonDxvk = SessionPrefs.bridgeProtonDxvk(context), + autoPossible = !com.droiddeck.launcher.core.DeviceSupport.adreno(), + ) } + + fun settleAutoDxvk(context: Context) { + val app = context.applicationContext + Thread({ + runCatching { ensureForcedPackages(app) } + .onSuccess { if (it != null) Log.i(TAG, it) } + .onFailure { Log.w(TAG, "automatic DXVK", it) } + }, "auto-dxvk").start() + } + + internal fun undoAutoChoice(context: Context, protonId: String, comp: String): String = synchronized(lock) { + val p = proton(context, protonId) + val state = loadState(context) + val entry = state.sub("active").optJSONObject(p.id)?.optJSONObject(comp) + val sameProton = entry?.optString("protonVersion") == p.version + if (sameProton && originalFile(context, p, comp).isFile) + return restore(context, protonId, comp, safeName(p.version)) + if (sameProton) { + Log.w(TAG, "${p.name}: its own ${LABEL[comp]} copy is gone; keeping ${entry?.optString("label")}") + return "${LABEL[comp]}: ${p.name} keeps ${entry?.optString("label")} (its own copy is gone)" + } + state.sub("active").optJSONObject(p.id)?.remove(comp) + saveState(context, state) + "${LABEL[comp]}: ${p.name} keeps its own copy" + } internal fun ensureForcedPackages( context: Context, @@ -1027,16 +1091,35 @@ object ComponentsManager { lookup: (file: String, release: String) -> CatalogItem?, fetch: (CatalogItem) -> Unit, apply: (protonId: String, file: String) -> String, + vulkan: AppVulkan? = null, + bridgeSession: Boolean = false, + applyAuto: (protonId: String, file: String) -> String = apply, + undoAuto: (protonId: String, comp: String) -> String = { _, _ -> "" }, + keepProtonDxvk: Boolean = false, + autoPossible: Boolean = true, ): String? { - val rules = FORCED_PACKAGES.filter { it.matches(gpu) } - if (rules.isEmpty()) return null + val chooseDxvk = bridgeSession && !keepProtonDxvk + val bridgeRule = if (chooseDxvk) bridgeDxvk(vulkan) else null + val rules = FORCED_PACKAGES.filter { it.matches(gpu) }.map { it to false } + listOfNotNull(bridgeRule?.let { it to true }) + if (rules.isEmpty() && !autoPossible) return null val installed = protons(context) val lines = mutableListOf<String>() - for (rule in rules) { + fun each(p: Proton, what: () -> String): String = + runCatching(what).getOrElse { e -> Log.w(TAG, "${p.name}: ${e.message}", e); "${p.name}: ${e.message ?: e.javaClass.simpleName}" } + if (autoPossible && autoDxvkUndoWanted(bridgeSession, keepProtonDxvk, vulkan, bridgeRule)) { + dropQueuedAuto(context, installed) + val state = loadState(context) + for (p in installed) { + val entry = state.optJSONObject("active")?.optJSONObject(p.id)?.optJSONObject("dxvk") + if (autoChoiceStale(entry, null)) lines.add(each(p) { undoAuto(p.id, "dxvk") }) + } + } + for ((rule, auto) in rules) { val state = loadState(context) val targets = installed.filter { p -> val active = state.optJSONObject("active")?.optJSONObject(p.id)?.optJSONObject(rule.comp) - forcedPackageWanted(active?.optString("file"), active?.optString("protonVersion") == p.version) + forcedPackageWanted(active?.optString("file"), active?.optString("protonVersion") == p.version) || + (auto && autoChoiceStale(active, rule.file)) } if (targets.isEmpty()) continue val missing = missingPackage(context, rule, lookup, fetch) @@ -1044,9 +1127,10 @@ object ComponentsManager { lines.add(missing) continue } - lines.add(targets.joinToString("; ") { apply(it.id, rule.file) }) + if (auto) lines.add("${vulkan?.label}: DXVK ${rule.file}") + lines.add(targets.joinToString("; ") { p -> if (auto) each(p) { applyAuto(p.id, rule.file) } else apply(p.id, rule.file) }) } - return lines.joinToString("; ").ifEmpty { null } + return lines.filter { it.isNotEmpty() }.joinToString("; ").ifEmpty { null } } private fun missingPackage( diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 09122644dc..a947bf7e1f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -171,6 +171,9 @@ object SessionFiles { val optional = (arrayOf( "usr/local/bin/gamescope" to "usr/local/bin/gamescope", "usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so" to "usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so", + "usr/local/lib/vkbridge/libvulkan_droidbridge.so" to "usr/local/lib/vkbridge/libvulkan_droidbridge.so", + "usr/local/share/vkbridge/droidbridge_icd.json" to "usr/local/share/vkbridge/droidbridge_icd.json", + "usr/local/bin/droiddeck-vkbridge-smoke" to "usr/local/bin/droiddeck-vkbridge-smoke", "usr/local/lib/droiddeck/uruntime" to "usr/local/lib/droiddeck/uruntime", "usr/local/lib/droiddeck-pipewire.tzst" to "usr/local/lib/droiddeck-pipewire.tzst", "usr/local/share/licenses/uruntime/LICENSE" to "usr/local/share/licenses/uruntime/LICENSE", diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index a6bcaed7cb..48bdeffdef 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -348,6 +348,32 @@ object SessionPrefs { prefs(context).edit().putInt("hudOpacity", percent.coerceIn(HUD_OPACITY_RANGE)).apply() } + const val PC_KEYBOARD_SIZE_DEFAULT = 47 + val PC_KEYBOARD_SIZE_RANGE = 25..70 + const val PC_KEYBOARD_OPACITY_DEFAULT = 100 + val PC_KEYBOARD_OPACITY_RANGE = 30..100 + + fun pcKeyboardSize(context: Context): Int = + prefs(context).getInt("pcKeyboardSize", PC_KEYBOARD_SIZE_DEFAULT).takeIf { it in PC_KEYBOARD_SIZE_RANGE } ?: PC_KEYBOARD_SIZE_DEFAULT + + fun setPcKeyboardSize(context: Context, percent: Int) { + prefs(context).edit().putInt("pcKeyboardSize", percent.coerceIn(PC_KEYBOARD_SIZE_RANGE)).apply() + } + + fun pcKeyboardOpacity(context: Context): Int = + prefs(context).getInt("pcKeyboardOpacity", PC_KEYBOARD_OPACITY_DEFAULT).takeIf { it in PC_KEYBOARD_OPACITY_RANGE } ?: PC_KEYBOARD_OPACITY_DEFAULT + + fun setPcKeyboardOpacity(context: Context, percent: Int) { + prefs(context).edit().putInt("pcKeyboardOpacity", percent.coerceIn(PC_KEYBOARD_OPACITY_RANGE)).apply() + } + + fun pcKeyboardHiddenKeys(context: Context): Set<String> = + idList(prefs(context).getString("pcKeyboardHiddenKeys", null)).toSet() + + fun setPcKeyboardHiddenKeys(context: Context, hidden: Set<String>) { + prefs(context).edit().putString("pcKeyboardHiddenKeys", hidden.joinToString(",")).apply() + } + fun droidDeckHudConfig(context: Context): String? = prefs(context).getString("__KEEP_droidDeckHud__", null) fun setDroidDeckHudConfig(context: Context, config: String) { @@ -746,6 +772,29 @@ object SessionPrefs { fun zinkLazy(context: Context): Boolean = prefs(context).getBoolean("zinkLazy", true) + @JvmStatic + fun vkBridge(context: Context): Boolean = prefs(context).getBoolean("vkBridge", com.droiddeck.launcher.core.DeviceSupport.mali()) + + fun setVkBridge(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("vkBridge", on).apply() + } + + @JvmStatic + fun bridgeProtonDxvk(context: Context): Boolean = prefs(context).getBoolean("bridgeProtonDxvk", false) + + fun setBridgeProtonDxvk(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("bridgeProtonDxvk", on).apply() + } + + fun vkBridgeSafe(context: Context): Boolean = prefs(context).getBoolean("vkBridgeSafe", true) + + fun setVkBridgeSafe(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("vkBridgeSafe", on).apply() + } + + @JvmStatic + fun vkBridgeMode(context: Context): String = if (vkBridgeSafe(context)) "safe" else "performance" + fun setZinkLazy(context: Context, on: Boolean) { prefs(context).edit().putBoolean("zinkLazy", on).apply() } @@ -841,6 +890,9 @@ object SessionPrefs { fun battleNetNoSteamSet(context: Context): Boolean = prefs(context).getBoolean("battleNetNoSteamSet", false) fun setBattleNetNoSteamSet(context: Context) { prefs(context).edit().putBoolean("battleNetNoSteamSet", true).apply() } + fun battleNetFolder(context: Context, code: String): String? = prefs(context).getString("battleNetFolder:$code", null) + fun setBattleNetFolder(context: Context, code: String, path: String) { prefs(context).edit().putString("battleNetFolder:$code", path).apply() } + fun clearCachedApps(context: Context): Boolean = prefs(context).getBoolean("clearCachedApps", false) fun setClearCachedApps(context: Context, on: Boolean) { prefs(context).edit().putBoolean("clearCachedApps", on).apply() } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 679dce6e2e..e9d322b59f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -70,6 +70,7 @@ class SessionService : Service() { private val mainHandler = Handler(Looper.getMainLooper()) private var suspendController: SessionSuspendController? = null private val steamDownloadMonitor = SteamDownloadMonitor() + private val downloadMonitorExecutor = java.util.concurrent.Executors.newSingleThreadExecutor { Thread(it, "steam-download-monitor").apply { isDaemon = true } } private var downloadMonitorTask: Runnable? = null private var downloadActive = false private var clientInstallActive = false @@ -346,7 +347,7 @@ class SessionService : Service() { screenOn = readScreenOn() manualPauseRequested = false suspendDownloadNow = false - steamDownloadMonitor.reset() + runOnDownloadMonitor { steamDownloadMonitor.reset() } downloadActive = false clientInstallActive = false steamSleepToken = null @@ -371,9 +372,10 @@ class SessionService : Service() { SessionState.steamUi = intent?.getStringExtra(EXTRA_STEAM_UI) SessionState.steamUrl = intent?.getStringExtra(EXTRA_STEAM_URL) com.droiddeck.launcher.stores.battlenet.BattleNetClient.clearRequests(LinuxRuntime.sessionRoot(this)) - synchronized(stopLock) { + val gen = synchronized(stopLock) { SessionState.steamClientArch = null SessionState.running = true + ++sessionGen } if (SessionState.stopRequested) { stopSession(0) @@ -384,7 +386,6 @@ class SessionService : Service() { SessionState.guestPid = -1 SessionEvents.transition(SessionPhase.STARTING_GUEST, "service.started", mapOf("mode" to SessionState.mode)) com.droiddeck.launcher.wayland.CompositorHost.newSession() - val gen = ++sessionGen SessionPrefs.backgroundAppLimit(this).takeIf { it != com.droiddeck.launcher.core.BackgroundAppLimit.OFF } ?.let { com.droiddeck.launcher.core.BackgroundAppLimit.applyAsync(this, it) } if (SessionPrefs.clearCachedApps(this)) clearCachedApps() @@ -440,7 +441,7 @@ class SessionService : Service() { LinuxRuntime.writeAccounts(this) } catch (e: Exception) { Log.e(TAG, "could not write the guest's passwd/group", e) - stopSession(-1) + stopSession(-1, gen) return } @@ -467,8 +468,8 @@ class SessionService : Service() { } else { val message = getString(R.string.session_proot_missing) Log.e(TAG, "$message (pack ready=$prootPack)") - SessionEvents.fail("PROOT_MISSING", message, -1) - stopSession(-1) + failSession(gen, "PROOT_MISSING", message, -1) + stopSession(-1, gen) return } } @@ -488,7 +489,7 @@ class SessionService : Service() { GameEnvironmentStore.publish(this) } catch (e: Exception) { Log.e(TAG, "could not publish the game environment", e) - stopSession(-1) + stopSession(-1, gen) return } val sessionLog = File(sessionDir, "session.log") @@ -522,6 +523,7 @@ class SessionService : Service() { components.add(encoder) guest.add("BL_VENC_SOCKET=" + encoder.socket.absolutePath) } + startVkBridge(guest, sessionDir) guest.add("BL_WIDTH=" + size.first) guest.add("BL_HEIGHT=" + size.second) @@ -586,7 +588,7 @@ class SessionService : Service() { val program = SessionState.program if (program.isNullOrEmpty()) { Log.e(TAG, "run mode without a program") - stopSession(65) + stopSession(65, gen) return } guest.add(program) @@ -681,7 +683,7 @@ class SessionService : Service() { } val program = programStatus(sessionRoot) Log.i(TAG, "session ended: $status" + if (program != null) " (program $program)" else "") - stopSession(program ?: status ?: -1) + stopSession(program ?: status ?: -1, gen) }, null, sessionLog.takeIf { "PROOT_PROFILE=1" in hostEnv.asArray() }) Log.i(TAG, "session pid $pid, log ${sessionLog.path}") if (gen != sessionGen || !SessionState.running) { @@ -703,8 +705,8 @@ class SessionService : Service() { SessionEvents.guestStarted(pid) } else { SessionEvents.record("guest.start_failed", mapOf("pid" to pid)) - SessionEvents.fail("GUEST_START_FAILED", "The guest process could not be started", pid) - stopSession(-1) + failSession(gen, "GUEST_START_FAILED", "The guest process could not be started", pid) + stopSession(-1, gen) return } if (gen == sessionGen && SessionState.running) { @@ -811,7 +813,7 @@ class SessionService : Service() { ?: SessionPrefs.androidDriver(this), linuxDriverId, ) - LinuxVulkanDriver.resolveIcdPath(this, linuxDriverId) + if (!com.droiddeck.launcher.core.DeviceSupport.vkBridge(this)) LinuxVulkanDriver.resolveIcdPath(this, linuxDriverId) ?.let { guest.add(LinuxVulkanDriver.ENV + "=" + it) } val tuOverride = tuDebugOverride() val tuDriver = sysmemDriver(linuxDriverId) @@ -866,6 +868,27 @@ class SessionService : Service() { private fun noSteamGame(): Boolean = SessionState.mode == MODE_RUN && SessionState.program in setOf(NoSteamLaunch.PROTON_RUN, NoSteamLaunch.EPIC, NoSteamLaunch.BATTLENET) + private fun startVkBridge(guest: MutableList<String>, sessionDir: File) { + if (!com.droiddeck.launcher.core.DeviceSupport.vkBridge(this)) return + val socket = File(filesDir, "vkbridge/server.sock") + val bridge = com.droiddeck.launcher.gpu.VkBridgeComponent(socket, File(sessionDir, "vkbridge-server.log")) + bridge.attach(this) + components.add(bridge) + com.droiddeck.launcher.gpu.ClockLogComponent(File(sessionDir, "vkbridge-clocks.log")).let { + it.attach(this) + components.add(it) + } + guest.add("BL_VKBRIDGE=1") + guest.add("VKBRIDGE_SOCKET=" + socket.path) + guest.add("VKBRIDGE_CLIENT_LOG=" + File(sessionDir, "vkbridge-client.log").path) + guest.add("VKBRIDGE_MODE=" + SessionPrefs.vkBridgeMode(this)) + LinuxRuntime.gpuStandIn(this)?.let { node -> + guest.add("BL_DRM_STANDIN=$node") + LinuxRuntime.deviceNumbers(node)?.let { guest.add("VKBRIDGE_DRM_RENDER=$it") } + } + Log.i(TAG, "vkbridge: on (${com.droiddeck.launcher.core.DeviceSupport.gpuName(this)}, ${SessionPrefs.vkBridgeMode(this)} mode), socket $socket") + } + private fun startAudio(guest: MutableList<String>, sessionDir: File, directAudioPack: Boolean): PulseAudioComponent { val wantsDirectAudio = directAudioPack && (SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP || noSteamGame()) && @@ -1865,11 +1888,22 @@ class SessionService : Service() { }, "tracer-priority").start() } - private fun stopSession(status: Int) { - cancelQueuedSteamGame() - gameExitWatchToken++ + private fun failSession(gen: Int, code: String, message: String, status: Int?) { + synchronized(stopLock) { + if (gen == sessionGen) SessionEvents.fail(code, message, status) + } + } + + private fun stopSession(status: Int, gen: Int? = null) { + if (gen != null && gen != sessionGen) { + Log.i(TAG, "ignoring a stop from session $gen; session $sessionGen is current") + return + } completeNativeSleep() val (ended, endedArch) = synchronized(stopLock) { + if (gen != null && gen != sessionGen) return + cancelQueuedSteamGame() + gameExitWatchToken++ if (!SessionState.running) return SessionEvents.record("guest.exited", mapOf("status" to status)) SessionEvents.transition(SessionPhase.STOPPING, "session.stopping", mapOf("status" to status)) @@ -1979,6 +2013,9 @@ class SessionService : Service() { (getSystemService(Context.DISPLAY_SERVICE) as? DisplayManager)?.unregisterDisplayListener(displayListener) displayListenerRegistered = false } + downloadMonitorTask?.let(mainHandler::removeCallbacks) + downloadMonitorTask = null + downloadMonitorExecutor.shutdown() super.onDestroy() } @@ -2102,12 +2139,20 @@ class SessionService : Service() { SessionState.running && SessionState.mode == MODE_STEAM && suspendPolicy != SessionPrefs.SUSPEND_NEVER && (steamDownloadsInBackground || !SessionState.firstFrameSeen) + private fun runOnDownloadMonitor(task: () -> Unit) { + try { + downloadMonitorExecutor.execute(task) + } catch (e: java.util.concurrent.RejectedExecutionException) { + Log.d(TAG, "download monitor already shut down") + } + } + private fun updateDownloadMonitoring() { if (!downloadWatchWanted()) { val wasActive = downloadActive downloadMonitorTask?.let(mainHandler::removeCallbacks) downloadMonitorTask = null - steamDownloadMonitor.reset() + runOnDownloadMonitor { steamDownloadMonitor.reset() } downloadActive = false if (clientInstallActive) SessionEvents.record("steam.client_download", mapOf("active" to false)) clientInstallActive = false @@ -2129,18 +2174,30 @@ class SessionService : Service() { val wasInstalling = clientInstallActive clientInstallActive = !SessionState.firstFrameSeen && (clientInstallActive || SteamDownloadMonitor.clientInstallPending(root)) - downloadActive = clientInstallActive || steamDownloadsInBackground && steamDownloadMonitor.poll( - root, - receivedBytes = TrafficStats.getUidRxBytes(android.os.Process.myUid()), - client = SessionState.steamClientArch, - mounts = steamLibraryMounts, - ) - if (wasInstalling != clientInstallActive) { - SessionEvents.record("steam.client_download", mapOf("active" to clientInstallActive)) + val receivedBytes = TrafficStats.getUidRxBytes(android.os.Process.myUid()) + val client = SessionState.steamClientArch + val mounts = steamLibraryMounts + val self = this + val finish = { monitored: Boolean -> + if (downloadMonitorTask === self) { + downloadActive = clientInstallActive || monitored + if (wasInstalling != clientInstallActive) { + SessionEvents.record("steam.client_download", mapOf("active" to clientInstallActive)) + } + if (wasActive != downloadActive) refreshNotification() + updateSuspendPolicy() + mainHandler.postDelayed(self, DOWNLOAD_POLL_MS) + } + } + if (clientInstallActive || !steamDownloadsInBackground) { + finish(false) + return + } + runOnDownloadMonitor { + val monitored = runCatching { steamDownloadMonitor.poll(root, receivedBytes = receivedBytes, client = client, mounts = mounts) } + .getOrDefault(false) + mainHandler.post { finish(monitored) } } - if (wasActive != downloadActive) refreshNotification() - updateSuspendPolicy() - mainHandler.postDelayed(this, DOWNLOAD_POLL_MS) } } downloadMonitorTask = poll diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt index 8e63d05c67..2e66d2b80f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -93,6 +93,7 @@ object SessionState { @Volatile var secondScreenDisplay = -1 @Volatile var secondScreenAutoOpened = false @Volatile var secondScreenProvisional = false + @Volatile var gameOnBottom = false @Volatile var steamLibraryMounts: Map<String, java.io.File> = emptyMap() diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 07d330e10e..c47bdd7986 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -17,7 +17,7 @@ object SettingsReset { "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", - "stretch16x9", "picturePosition", "railLabels", + "stretch16x9", "picturePosition", "railLabels", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "zramClient", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt index 2d1ea267fc..06f63c32bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamLibraries.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.session import android.content.Context import android.os.storage.StorageManager import com.droiddeck.launcher.R +import com.droiddeck.launcher.files.StorageRoots import com.droiddeck.launcher.frontend.AddedGames import java.io.File import org.json.JSONArray @@ -49,15 +50,12 @@ object SteamLibraries { class Refused(val reason: String) : AddResult() } - fun add(context: Context, path: String, label: String = defaultLabel(context, File(path))): AddResult { + fun add(context: Context, picked: String, label: String? = null): AddResult { val entries = list(context) if (entries.size >= MAX) return AddResult.Refused(context.getString(R.string.libraries_full, MAX)) + val path = innerLibrary(File(picked))?.path ?: picked val host = canonical(File(path)) - val taken = entries.map { canonical(it.host) } + listOfNotNull( - GameStorage.effective(context)?.let { canonical(File(it.path)) }, - canonical(SessionPrefs.steamRoot(context, "arm64")), - ) - if (taken.any { overlaps(it, host) }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) + if (taken(context, entries).any { overlaps(it, host) }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) // Adding a Games folder itself is fine; a child of one would make it overlap and hide the rest of that folder. if (AddedGames.roots(context).any { host.startsWith(canonical(it.host) + "/") }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) GameStorage.prepare(context, path)?.let { return AddResult.Refused(it) } @@ -67,13 +65,70 @@ object SteamLibraries { if (current.any { overlaps(canonical(it.host), host) }) return AddResult.Refused(context.getString(R.string.libraries_overlap)) // A removed library's mount stays registered with Steam until its next session, so ids are never reused. val next = maxOf(SessionPrefs.steamLibraryNextId(context), (current.maxOfOrNull { it.id.toInt() } ?: 0) + 1) - val entry = Entry(next.toString(), path, clean(label).ifEmpty { File(path).name }) + val entry = Entry(next.toString(), path, clean(label ?: defaultLabel(context, File(path))).ifEmpty { File(path).name }) save(context, current + entry) SessionPrefs.setSteamLibraryNextId(context, next + 1) return AddResult.Added(entry) } } + private fun taken(context: Context, entries: List<Entry>): List<String> = entries.map { canonical(it.host) } + listOfNotNull( + GameStorage.effective(context)?.let { canonical(File(it.path)) }, + canonical(SessionPrefs.steamRoot(context, "arm64")), + ) + + class Found(val path: String, val shown: String, val label: String, val games: Int) + + /** Reads storage; call off the main thread. */ + fun found(context: Context): List<Found> { + val entries = list(context) + val taken = taken(context, entries) + AddedGames.roots(context).map { canonical(it.host) } + val hits = ArrayList<Pair<File, Int>>() + for (root in StorageRoots.list(context)) { + if (!root.readable) continue + for (dir in candidates(rawView(root.dir), SCAN_DEPTH)) { + val games = gameCount(dir) + if (games > 0 && File(dir, "steamapps").canWrite() && taken.none { overlaps(it, canonical(dir)) }) hits += dir to games + } + } + val picked = ArrayList<Pair<File, Int>>() + for (hit in hits.sortedByDescending { it.second }) { + if (picked.none { overlaps(canonical(it.first), canonical(hit.first)) }) picked += hit + } + return picked.map { (dir, games) -> + val shown = File(storagePath(dir.path)) + Found(dir.path, shown.path, defaultLabel(context, shown), games) + } + } + + /** The FUSE view under /storage hides files other apps wrote unless DroidDeck has all files access; the raw card mount does not. */ + private fun rawView(dir: File): File { + if (!dir.path.startsWith("/storage/") || dir.path.startsWith("/storage/emulated")) return dir + val raw = File("/mnt/media_rw/" + dir.path.removePrefix("/storage/")) + return if (raw.canRead() && raw.list() != null) raw else dir + } + + internal fun innerLibrary(picked: File): File? { + if (gameCount(picked) > 0) return null + return candidates(picked, 1).filter { it != picked && gameCount(it) > 0 }.singleOrNull() + } + + internal fun candidates(root: File, depth: Int): List<File> { + val out = arrayListOf(root) + var level = listOf(root) + repeat(depth) { + level = level.flatMap { dir -> + dir.listFiles { f -> f.isDirectory && !f.name.startsWith(".") && f.name != "steamapps" && !(dir == root && f.name == "Android") } + .orEmpty().sortedBy { it.name } + }.take(SCAN_LIMIT - out.size) + out += level + } + return out + } + + internal fun gameCount(library: File): Int = + File(library, "steamapps").list()?.count { it.startsWith("appmanifest_") && it.endsWith(".acf") } ?: 0 + fun rename(context: Context, id: String, label: String) { val name = clean(label).takeIf { it.isNotEmpty() } ?: return synchronized(lock) { save(context, list(context).map { if (it.id == id) Entry(it.id, it.path, name) else it }) } @@ -84,17 +139,27 @@ object SteamLibraries { synchronized(lock) { save(context, list(context).filterNot { it.id == id }) } } - fun defaultLabel(context: Context, folder: File): String { + fun defaultLabel(context: Context, picked: File): String { + val folder = File(storagePath(picked.path)) val volume = try { context.getSystemService(StorageManager::class.java)?.getStorageVolume(folder)?.getDescription(context) } catch (e: Exception) { null } - val name = folder.name.ifEmpty { context.getString(R.string.gstore_folder) } + val parent = folder.parentFile + val named = if (folder.name.equals("Steam", true) && parent != null && !volumeRoot(parent)) parent else folder + val name = named.name.ifEmpty { context.getString(R.string.gstore_folder) } return clean(if (volume.isNullOrBlank()) name else context.getString(R.string.gstore_folder_on_volume, name, volume)) } + private fun volumeRoot(dir: File): Boolean = dir.parent in setOf("/storage", "/mnt/media_rw", "/storage/emulated") || dir.parent == null + internal fun overlaps(a: String, b: String): Boolean = a == b || a.startsWith("$b/") || b.startsWith("$a/") - private fun canonical(file: File): String = runCatching { file.canonicalPath }.getOrDefault(file.absolutePath) + private fun storagePath(path: String): String = if (path.startsWith("/mnt/media_rw/")) "/storage/" + path.removePrefix("/mnt/media_rw/") else path + + private fun canonical(file: File): String = storagePath(runCatching { file.canonicalPath }.getOrDefault(file.absolutePath)) + + private const val SCAN_DEPTH = 2 + private const val SCAN_LIMIT = 4000 } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt index d5991b5c09..f6be827cf5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt @@ -20,6 +20,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.Menu +import androidx.compose.material.icons.outlined.SwapVert import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -84,10 +85,11 @@ fun BottomDashboard( pages: List<BottomPage>, remembered: String?, onPage: (String) -> Unit, - onClose: () -> Unit, + onClose: (() -> Unit)?, onMenu: (() -> Unit)?, gameStarts: Int = 0, strip: (@Composable (String?) -> Unit)? = null, + onSwap: (() -> Unit)? = null, ) { val colors = MaterialTheme.colorScheme var current by remember { mutableStateOf(pickBottomPage(remembered, pages.map { it.id })) } @@ -100,7 +102,7 @@ fun BottomDashboard( val labels = bottomTabsWithLabels(maxWidth.value, pages.size) Column(Modifier.fillMaxSize().padding(horizontal = 12.dp, vertical = 10.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { Row(Modifier.fillMaxWidth().height(48.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - BarButton(Icons.Outlined.Close, stringResource(R.string.deck_close), "bottom-close", onClose) + if (onClose != null) BarButton(Icons.Outlined.Close, stringResource(R.string.deck_close), "bottom-close", onClose) Row(Modifier.weight(1f).horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(6.dp)) { pages.forEach { p -> PageTab(p, p.id == page?.id, labels) { @@ -109,6 +111,7 @@ fun BottomDashboard( } } } + if (onSwap != null) BarButton(Icons.Outlined.SwapVert, stringResource(R.string.swap_screens), "bottom-swap", onSwap) if (onMenu != null) BarButton(Icons.Outlined.Menu, stringResource(R.string.touch_droiddeck_menu), "bottom-menu", onMenu) } strip?.invoke(page?.id) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt index d6b80ac813..0b838b8f1a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDesktopPanel.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.content.Context import android.content.res.Configuration import android.graphics.Color +import android.os.Build import android.os.SystemClock import android.graphics.Typeface import android.view.Gravity @@ -13,6 +14,7 @@ import android.view.SurfaceHolder import android.view.SurfaceView import android.view.View import android.view.ViewConfiguration +import android.view.WindowInsets import android.graphics.RectF import androidx.compose.runtime.mutableStateOf import androidx.compose.ui.platform.ComposeView @@ -33,9 +35,11 @@ import com.droiddeck.launcher.session.BottomDesktop @SuppressLint("ViewConstructor") class BottomDesktopPanel( context: Context, - onClose: () -> Unit, + onClose: (() -> Unit)?, onMenu: (() -> Unit)?, steamButtons: Pair<() -> Unit, () -> Unit>?, + onSwap: (() -> Unit)? = null, + private val fullResolution: Boolean = false, ) : LinearLayout(context), SurfaceHolder.Callback { private lateinit var surfaceView: SurfaceView private val area = FrameLayout(context).apply { clipChildren = true } @@ -66,7 +70,7 @@ class BottomDesktopPanel( setBackgroundColor(Color.BLACK) isFocusable = true isFocusableInTouchMode = true - addView(bar(onClose, onMenu, steamButtons), LayoutParams(-1, -2)) + addView(bar(onClose, onMenu, steamButtons, onSwap), LayoutParams(-1, -2)) area.addView(keyboardHost) addSurface() area.addView(status, FrameLayout.LayoutParams(-1, -1)) @@ -83,7 +87,7 @@ class BottomDesktopPanel( area.addView(surfaceView, 1, FrameLayout.LayoutParams(fullWidth.takeIf { it > 0 } ?: -1, fullHeight.takeIf { it > 0 } ?: -1)) } - private fun bar(onClose: () -> Unit, onMenu: (() -> Unit)?, steamButtons: Pair<() -> Unit, () -> Unit>?): View { + private fun bar(onClose: (() -> Unit)?, onMenu: (() -> Unit)?, steamButtons: Pair<() -> Unit, () -> Unit>?, onSwap: (() -> Unit)?): View { val bar = LinearLayout(context).apply { orientation = HORIZONTAL gravity = Gravity.CENTER_VERTICAL @@ -91,7 +95,7 @@ class BottomDesktopPanel( setBackgroundColor(Color.BLACK) } fun gap() = View(context).apply { layoutParams = LayoutParams(dp(6), 1) } - bar.addView(DeckControlsPanel.roundButton(context, "×", context.getString(R.string.deck_close), onClose)) + onClose?.let { bar.addView(DeckControlsPanel.roundButton(context, "×", context.getString(R.string.deck_close), it)) } title = TextView(context).apply { textSize = 14f typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD) @@ -106,6 +110,10 @@ class BottomDesktopPanel( bar.addView(gap()) bar.addView(DeckControlsPanel.iconButton(context, R.drawable.ic_bottom_keyboard, context.getString(R.string.second_show_keyboard)) { keyboardHost.toggle() }) + onSwap?.let { + bar.addView(gap()) + bar.addView(DeckControlsPanel.iconButton(context, R.drawable.ic_bottom_swap, context.getString(R.string.swap_screens), it)) + } onMenu?.let { bar.addView(gap()) bar.addView(DeckControlsPanel.menuButton(context, it)) @@ -187,7 +195,9 @@ class BottomDesktopPanel( addSurface() return } - if (attached) attach(surfaceView.holder) + if (!attached) return + attached = false + syncSurface(surfaceView.holder) } private fun showState() { @@ -208,13 +218,28 @@ class BottomDesktopPanel( if (w != fullWidth || h > fullHeight || !keyboardHost.shown) { fullWidth = w fullHeight = h - surfaceView.layoutParams = FrameLayout.LayoutParams(w, h) + val (desktopW, desktopH) = BottomDesktop.outputSizeFor(w, h, fullResolution) + val (fitW, fitH) = if (w - desktopW in 0..1 && h - desktopH in 0..1) desktopW to desktopH + else fitDesktop(w, h, desktopW, desktopH) + surfaceView.layoutParams = if (fitW == w && fitH == h) FrameLayout.LayoutParams(w, h) + else FrameLayout.LayoutParams(fitW, fitH, Gravity.CENTER_HORIZONTAL).apply { topMargin = (h - fitH) / 2 } + surfaceView.post { syncSurface(surfaceView.holder) } } pan() } + private fun imeOverlap(): Int { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) return 0 + if (area.height < fullHeight) return 0 + val ime = rootWindowInsets?.getInsets(WindowInsets.Type.ime())?.bottom ?: return 0 + if (ime <= 0) return 0 + val at = IntArray(2) + area.getLocationInWindow(at) + return (at[1] + area.height - (rootView.height - ime)).coerceIn(0, area.height) + } + private fun pan() { - val visible = area.height + val visible = area.height - imeOverlap() val hidden = (fullHeight - visible).coerceAtLeast(0) val anchor = if (directTouch) lastTouchY else trackpad.y surfaceView.translationY = if (hidden == 0 || !keyboardHost.shown) 0f @@ -223,24 +248,27 @@ class BottomDesktopPanel( override fun surfaceCreated(holder: SurfaceHolder) = Unit - override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) { - if (!attached) attach(holder) - } + override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) = syncSurface(holder) override fun surfaceDestroyed(holder: SurfaceHolder) { if (holder !== surfaceView.holder) return attached = false surfaceUsed = false - BottomDesktop.detach() + BottomDesktop.detach(holder.surface) } - private fun attach(holder: SurfaceHolder) { - val frame = holder.surfaceFrame - val (width, height) = BottomDesktop.outputSizeFor(fullWidth.takeIf { it > 0 } ?: frame.width(), - fullHeight.takeIf { it > 0 } ?: frame.height()) + private fun syncSurface(holder: SurfaceHolder) { + if (holder !== surfaceView.holder || fullWidth <= 0 || fullHeight <= 0 || !holder.surface.isValid) return + val (width, height) = BottomDesktop.outputSizeFor(fullWidth, fullHeight, fullResolution) if (width <= 0 || height <= 0) return + val frame = holder.surfaceFrame if (frame.width() != width || frame.height() != height) { - holder.setFixedSize(width, height) + val params = surfaceView.layoutParams + if (params.width == width && params.height == height) holder.setSizeFromLayout() else holder.setFixedSize(width, height) + return + } + if (attached) { + BottomDesktop.resize(holder.surface, width, height) return } attached = true @@ -299,7 +327,7 @@ class BottomDesktopPanel( override fun onWheel(steps: Int) = BottomDesktop.sendScene(SCENE_WHEEL, steps) override fun onScroll(dx: Float, dy: Float) { - val (outW, outH) = BottomDesktop.outputSizeFor(surfaceView.width, surfaceView.height) + val (outW, outH) = BottomDesktop.outputSize scrollRestX += dx * outW / surfaceView.width.coerceAtLeast(1) * AXIS_UNITS_PER_PIXEL scrollRestY += dy * outH / surfaceView.height.coerceAtLeast(1) * AXIS_UNITS_PER_PIXEL val h = scrollRestX.toInt() @@ -343,3 +371,11 @@ class BottomDesktopPanel( const val TEXT_FIELD_TAP_MS = 1_000L } } + +internal fun fitDesktop(areaW: Int, areaH: Int, desktopW: Int, desktopH: Int): Pair<Int, Int> { + if (areaW <= 0 || areaH <= 0 || desktopW <= 0 || desktopH <= 0) return areaW to areaH + val widthLimited = areaW.toLong() * desktopH <= areaH.toLong() * desktopW + val w = if (widthLimited) areaW else (desktopW.toLong() * areaH / desktopH).toInt() + val h = if (widthLimited) (desktopH.toLong() * areaW / desktopW).toInt() else areaH + return if (areaW - w <= 4 && areaH - h <= 4) areaW to areaH else w to h +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomGameScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomGameScreen.kt new file mode 100644 index 0000000000..ba5b5af126 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomGameScreen.kt @@ -0,0 +1,66 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.app.Presentation +import android.graphics.Color +import android.os.Bundle +import android.view.Display +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.SurfaceHolder +import android.view.SurfaceView +import android.view.View +import android.view.ViewGroup +import android.view.WindowManager +import android.widget.FrameLayout + +class BottomGameScreen( + private val activity: Activity, + display: Display, + private val callback: SurfaceHolder.Callback, + private val onTouch: (MotionEvent) -> Boolean, +) : Presentation(activity, display) { + val surfaceView = SurfaceView(getContext()) + val holder: SurfaceHolder get() = surfaceView.holder + + val hz: Float get() = display.mode.refreshRate + + init { + setCancelable(false) + setCanceledOnTouchOutside(false) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + val root = FrameLayout(context).apply { setBackgroundColor(Color.BLACK) } + root.addView(surfaceView, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)) + setContentView(root) + window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + @Suppress("DEPRECATION") + window?.decorView?.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY + or View.SYSTEM_UI_FLAG_FULLSCREEN + or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LAYOUT_STABLE + or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) + surfaceView.setOnTouchListener { _, event -> onTouch(event) } + surfaceView.holder.addCallback(callback) + } + + override fun dispatchKeyEvent(event: KeyEvent): Boolean = + activity.dispatchKeyEvent(event) || super.dispatchKeyEvent(event) + + override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean = + activity.dispatchGenericMotionEvent(event) || super.dispatchGenericMotionEvent(event) +} + +object GameScreenSwap { + fun wanted( + requested: Boolean, + activityStarted: Boolean, + sessionEnded: Boolean, + inPip: Boolean, + glassesOutput: Boolean, + bottomScreenFree: Boolean, + ): Boolean = requested && activityStarted && !sessionEnded && !inPip && !glassesOutput && bottomScreenFree +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt index 58f1bd76dd..3df2090bc4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomStrip.kt @@ -27,7 +27,7 @@ import kotlinx.coroutines.isActive import kotlinx.coroutines.withContext import java.io.File -private const val STRIP_FRAME_MS = 100L +private const val STRIP_FRAME_MS = 33L private const val STRIP_METRICS_MS = 500L private const val STRIP_TEMP_PLAIN = 0xFFF2F5F9.toInt() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt index 934ad773a7..4aee7fc22f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt @@ -96,7 +96,7 @@ private const val ELITE_MS = 1_000L private const val ELITE_SEARCH_MS = 10_000L private const val OUTPUT_SCAN_MS = 3_000L private const val PERF_N = 60 -private const val FRAME_MS = 100L +private const val FRAME_MS = 33L private const val MINUTE_NS = 60_000_000_000L private const val TEMP_PLAIN = 0xFFF2F5F9.toInt() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index eff9453d6a..9bf266b834 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -149,6 +149,10 @@ class FrontEndState( val oscMode: String = SessionPrefs.OSC_AUTO, val controller: com.droiddeck.launcher.input.ControllerPrefs.Settings? = null, val phantomProcessStatus: PhantomProcessStatus = PhantomProcessStatus.NOT_APPLICABLE, + val adreno: Boolean = true, + val vkBridge: Boolean = false, + val vkBridgeSafe: Boolean = true, + val bridgeProtonDxvk: Boolean = false, val showPhantomGate: Boolean = false, val orientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, val launcherOrientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER, @@ -205,6 +209,9 @@ class FrontEndActions( val onInstallPackage: (String) -> Unit, val onRemovePackage: (String) -> Unit, val onRuntime: () -> Unit, + val onVkBridge: (Boolean) -> Unit = {}, + val onVkBridgeSafe: (Boolean) -> Unit = {}, + val onBridgeProtonDxvk: (Boolean) -> Unit = {}, val onFrameGenPick: (FrameGen.Mode) -> Unit, val onImportLossless: () -> Unit, val onProtons: () -> Unit, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 16d18840d8..f7969fe6c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -171,7 +171,7 @@ internal fun SetupPanel( val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val gpu = remember { com.droiddeck.launcher.gpu.GpuInfo.detect() } - val gpuOk = gpu.support == com.droiddeck.launcher.gpu.GpuInfo.Support.TESTED + val gpuOk = gpu.support == com.droiddeck.launcher.gpu.GpuInfo.Support.TESTED || s.vkBridge val gpuName = remember { DeviceSupport.gpuName(ctx) } val limitBlocks = PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) val signedIn = s.offlineAccount != null @@ -232,7 +232,7 @@ internal fun SetupPanel( val runtimeOk = s.ready && !s.busy && !s.removalPending val checks = listOf(gpuOk, runtimeOk, !limitBlocks, signedIn) val passing = checks.count { it } - var showChecks by rememberSaveable { mutableStateOf(false) } + var showChecks by rememberSaveable { mutableStateOf(s.vkBridge) } Rise(0, Modifier.fillMaxSize()) { Column( modifier = Modifier.fillMaxSize().bumpers( @@ -249,17 +249,49 @@ internal fun SetupPanel( val gpuCheck: @Composable (Boolean) -> Unit = { divider -> CheckRow( if (gpuOk) CheckState.OK else CheckState.WARN, - when (gpu.support) { - com.droiddeck.launcher.gpu.GpuInfo.Support.TESTED -> stringResource(R.string.setup_gpu_supported) - com.droiddeck.launcher.gpu.GpuInfo.Support.UNTESTED -> stringResource(R.string.setup_gpu_untested) + when { + gpu.support == com.droiddeck.launcher.gpu.GpuInfo.Support.TESTED -> stringResource(R.string.setup_gpu_supported) + gpu.support == com.droiddeck.launcher.gpu.GpuInfo.Support.UNTESTED -> stringResource(R.string.setup_gpu_untested) + s.vkBridge -> stringResource(R.string.setup_gpu_bridged) else -> stringResource(R.string.setup_gpu_unsupported) }, when (gpu.support) { com.droiddeck.launcher.gpu.GpuInfo.Support.TESTED -> stringResource(R.string.setup_gpu_detail, gpu.displayName(ctx), gpuName) com.droiddeck.launcher.gpu.GpuInfo.Support.UNTESTED -> stringResource(R.string.setup_gpu_untested_detail, gpu.displayName(ctx), gpu.supportText(ctx).replaceFirstChar { it.lowercase() }) - else -> stringResource(R.string.setup_gpu_unsupported_detail, gpuName) + else -> if (s.vkBridge) stringResource(R.string.setup_gpu_bridge_detail, gpuName) + else stringResource(R.string.setup_gpu_unsupported_detail, gpuName) }, + divider = divider || (!s.adreno && s.vkBridge), + action = if (s.adreno) null else { { + SecondaryButton( + stringResource(if (s.vkBridge) R.string.setup_gpu_bridge_on else R.string.setup_gpu_bridge_off), + enabled = !s.sessionRunning, compact = true, onClick = { a.onVkBridge(!s.vkBridge) }, + ) + } }, + ) + if (!s.adreno && s.vkBridge) CheckRow( + CheckState.OK, + stringResource(R.string.setup_bridge_safe), + stringResource(if (s.vkBridgeSafe) R.string.setup_bridge_safe_on_detail else R.string.setup_bridge_safe_off_detail), divider = divider, + action = { + SecondaryButton( + stringResource(if (s.vkBridgeSafe) R.string.setup_bridge_safe_on else R.string.setup_bridge_safe_off), + enabled = !s.sessionRunning, compact = true, onClick = { a.onVkBridgeSafe(!s.vkBridgeSafe) }, + ) + }, + ) + if (!s.adreno && s.vkBridge) CheckRow( + CheckState.OK, + stringResource(R.string.setup_bridge_dxvk), + stringResource(if (s.bridgeProtonDxvk) R.string.setup_bridge_dxvk_proton_detail else R.string.setup_bridge_dxvk_auto_detail), + divider = divider, + action = { + SecondaryButton( + stringResource(if (s.bridgeProtonDxvk) R.string.setup_bridge_dxvk_proton else R.string.setup_bridge_dxvk_auto), + enabled = !s.sessionRunning, compact = true, onClick = { a.onBridgeProtonDxvk(!s.bridgeProtonDxvk) }, + ) + }, ) } val runtimeCheck: @Composable (Boolean) -> Unit = { divider -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 315b8d6c08..dfaf8b6f71 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -75,6 +75,8 @@ class ModeSettings( val gameStorage: String? = null, val storageOptions: List<com.droiddeck.launcher.session.GameStorage.Option> = emptyList(), val steamLibraries: List<com.droiddeck.launcher.session.SteamLibraries.Entry> = emptyList(), + val foundSteamLibraries: List<com.droiddeck.launcher.session.SteamLibraries.Found> = emptyList(), + val allFilesAccessMissing: Boolean = false, val storageDiagnostics: Boolean = false, val fexPreset: String? = null, val forceSsbs: Boolean = false, @@ -126,6 +128,8 @@ class ModeSettingsActions( val onPickGameStorageFolder: () -> Unit = {}, val onStorageDiagnostics: (Boolean) -> Unit = {}, val onAddSteamLibrary: () -> Unit = {}, + val onAddFoundSteamLibrary: (path: String) -> Unit = {}, + val onAllowAllFilesAccess: () -> Unit = {}, val onRenameSteamLibrary: (id: String, label: String) -> Unit = { _, _ -> }, val onRemoveSteamLibrary: (id: String) -> Unit = {}, val onFexPreset: (String) -> Unit = {}, @@ -421,6 +425,19 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: } } } + if (s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX) for (found in s.foundSteamLibraries) { + SettingsRow( + found.label, + stringResource(R.string.libraries_found_hint, pluralStringResource(R.plurals.mode_added_count, found.games, found.games), found.shown), + ) { + SecondaryButton(stringResource(R.string.libraries_add_found), compact = true) { a.onAddFoundSteamLibrary(found.path) } + } + } + if (s.allFilesAccessMissing && s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX) { + SettingsRow(stringResource(R.string.libraries_access_title), stringResource(R.string.libraries_access_hint)) { + SecondaryButton(stringResource(R.string.libraries_access_allow), compact = true, onClick = a.onAllowAllFilesAccess) + } + } SettingsRow( stringResource(R.string.libraries_add), if (s.steamLibraries.size < com.droiddeck.launcher.session.SteamLibraries.MAX) stringResource(R.string.libraries_hint) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt index 6c68c9cfc6..5c40727031 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.ui import com.droiddeck.launcher.R +import com.droiddeck.launcher.input.PC_KEY_HIDDEN_GROUPS import com.droiddeck.launcher.input.PC_KEY_ROWS import com.droiddeck.launcher.input.PC_MODIFIERS import com.droiddeck.launcher.input.PcKey @@ -35,6 +36,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.key import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateOf @@ -45,12 +47,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.input.key.nativeKeyCode import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.input.key.type import androidx.compose.ui.input.key.KeyEventType import androidx.compose.ui.input.key.key import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -98,10 +102,17 @@ fun PcKeyboard( } LaunchedEffect(Unit) { runCatching { firstKey.requestFocus() } } + val prefsContext = LocalContext.current + remember { PcKeyboardPrefs.load(prefsContext) } + val hiddenCodes = PcKeyboardPrefs.hiddenKeys.flatMap { PC_KEY_HIDDEN_GROUPS[it].orEmpty() }.toSet() + val rows = PC_KEY_ROWS.map { row -> row.filter { it.code !in hiddenCodes } }.filter { it.isNotEmpty() } + BoxWithConstraints(Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) { - val rowHeight = ((maxHeight * 0.47f - 24.dp - 3.dp * 6 - 10.dp) / 6).coerceIn(24.dp, 44.dp) + val rowHeight = ((maxHeight * (PcKeyboardPrefs.size / 100f) - 24.dp - 3.dp * rows.size - 10.dp) / rows.size) + .coerceIn(20.dp, 56.dp) Box( Modifier.fillMaxWidth() + .graphicsLayer { alpha = PcKeyboardPrefs.opacity / 100f } .background(Color(0xE6101418), RoundedCornerShape(topStart = 14.dp, topEnd = 14.dp)) .border(1.dp, pal.line2, RoundedCornerShape(topStart = 14.dp, topEnd = 14.dp)) .pointerInput(Unit) { awaitEachGesture { awaitFirstDown().consume(); waitForUpOrCancellation()?.consume() } } @@ -115,7 +126,7 @@ fun PcKeyboard( Spacer(Modifier.width(8.dp)) HeaderButton(stringResource(R.string.pckb_hide), onClose) } - PC_KEY_ROWS.forEachIndexed { r, row -> + rows.forEachIndexed { r, row -> Row(horizontalArrangement = Arrangement.spacedBy(3.dp), modifier = Modifier.fillMaxWidth().height(rowHeight)) { row.forEachIndexed { i, key -> val state = mods[key.code] ?: MOD_OFF @@ -126,11 +137,13 @@ fun PcKeyboard( key.label.length == 1 && key.label[0].isLetter() && (shifted xor capsOn) -> key.label.uppercase() else -> key.label } - KeyCap( - label, key.weight, lit, locked = state == MOD_LOCKED, - modifier = if (r == 0 && i == 0) Modifier.focusRequester(firstKey) else Modifier, - onDown = { press(key) }, onUp = { release(key) }, - ) + key(key.code) { + KeyCap( + label, key.weight, lit, locked = state == MOD_LOCKED, + modifier = if (r == 0 && i == 0) Modifier.focusRequester(firstKey) else Modifier, + onDown = { press(key) }, onUp = { release(key) }, + ) + } } } } @@ -164,8 +177,11 @@ private fun RowScope.KeyCap( awaitEachGesture { awaitFirstDown().consume() down = true; onDown() - waitForUpOrCancellation()?.consume() - down = false; onUp() + try { + waitForUpOrCancellation()?.consume() + } finally { + down = false; onUp() + } } } .onPreviewKeyEvent { e -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboardPrefs.kt b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboardPrefs.kt new file mode 100644 index 0000000000..3b31e0b992 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboardPrefs.kt @@ -0,0 +1,38 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.input.PC_KEY_HIDDEN_GROUPS +import com.droiddeck.launcher.session.SessionPrefs + +internal object PcKeyboardPrefs { + var size by mutableStateOf(SessionPrefs.PC_KEYBOARD_SIZE_DEFAULT) + private set + var opacity by mutableStateOf(SessionPrefs.PC_KEYBOARD_OPACITY_DEFAULT) + private set + var hiddenKeys by mutableStateOf(emptySet<String>()) + private set + + fun load(context: Context) { + size = SessionPrefs.pcKeyboardSize(context) + opacity = SessionPrefs.pcKeyboardOpacity(context) + hiddenKeys = SessionPrefs.pcKeyboardHiddenKeys(context).filter { it in PC_KEY_HIDDEN_GROUPS }.toSet() + } + + fun setSize(context: Context, percent: Int) { + size = percent + SessionPrefs.setPcKeyboardSize(context, percent) + } + + fun setOpacity(context: Context, percent: Int) { + opacity = percent + SessionPrefs.setPcKeyboardOpacity(context, percent) + } + + fun toggleHiddenKey(context: Context, group: String, on: Boolean) { + hiddenKeys = if (on) hiddenKeys + group else hiddenKeys - group + SessionPrefs.setPcKeyboardHiddenKeys(context, hiddenKeys) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt index df4182e0de..26251ddada 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -58,6 +58,7 @@ class SecondScreenPresentation( private val onMenu: (() -> Unit)? = null, private val menu: (@androidx.compose.runtime.Composable () -> Unit)? = null, private val dashboard: (@androidx.compose.runtime.Composable () -> Unit)? = null, + private val onSwap: (() -> Unit)? = null, ) : Presentation(sessionActivity, display) { private val frame = FrameLayout(context) private var menuView: androidx.compose.ui.platform.ComposeView? = null @@ -246,7 +247,7 @@ class SecondScreenPresentation( SecondScreenMode.DESKTOP -> { ownComposeViews() root.addView(BottomDesktopPanel(context, onClose, onMenu, - (onSteamMenu to onQam).takeIf { SessionState.mode == SessionService.MODE_STEAM }), weightParams()) + (onSteamMenu to onQam).takeIf { SessionState.mode == SessionService.MODE_STEAM }, onSwap), weightParams()) } SecondScreenMode.NONE -> Unit } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 8bcf13c7de..f61ecd98a3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -154,6 +154,7 @@ import com.droiddeck.launcher.gpu.SteamVr import com.droiddeck.launcher.gpu.ScreenEffects import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.ComponentsManager +import com.droiddeck.launcher.input.PC_KEY_GROUP_IDS import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenMode import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_BEHAVIOR_CLICK @@ -245,6 +246,9 @@ class DrawerActions( val textureAnisotropy: Int? = 0, val textureLodBias: String? = TextureFiltering.LOD_BIAS_OFF, val secondScreenMode: SecondScreenMode, + val gameOnBottom: Boolean = false, + val gameSwapAvailable: Boolean = false, + val onGameOnBottom: (Boolean) -> Unit = {}, val dashboardAvailable: Boolean = false, val desktopAvailable: Boolean = false, val secondScreenDisplays: List<SecondScreenDisplay>, @@ -680,6 +684,28 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont host.open = null; a.onKeyboard() } } + val keyboardContext = LocalContext.current + remember { PcKeyboardPrefs.load(keyboardContext) } + SliderRow( + stringResource(R.string.pckb_size), stringResource(R.string.pckb_size_hint), + PcKeyboardPrefs.size, SessionPrefs.PC_KEYBOARD_SIZE_RANGE, step = 1, + format = { "$it%" }, modifier = focus.track(page, "pckb-size"), + onChange = { PcKeyboardPrefs.setSize(keyboardContext, it) }) + SliderRow( + stringResource(R.string.pckb_opacity), stringResource(R.string.pckb_opacity_hint), + PcKeyboardPrefs.opacity, SessionPrefs.PC_KEYBOARD_OPACITY_RANGE, step = 5, + format = { "$it%" }, modifier = focus.track(page, "pckb-opacity"), + onChange = { PcKeyboardPrefs.setOpacity(keyboardContext, it) }) + MultiRow( + host, "pckb-hidden", stringResource(R.string.pckb_hidden_keys), + stringResource(R.string.pckb_hidden_keys_hint), + listOf( + 0 to stringResource(R.string.pckb_group_function), + 1 to stringResource(R.string.pckb_group_nav), + 2 to stringResource(R.string.pckb_group_arrows), + ), + PC_KEY_GROUP_IDS.filterValues { it in PcKeyboardPrefs.hiddenKeys }.keys, + onToggle = { id, on -> PcKeyboardPrefs.toggleHiddenKey(keyboardContext, PC_KEY_GROUP_IDS.getValue(id), on) }) } } SessionDrawerPage.SECOND_SCREEN -> { @@ -1176,6 +1202,11 @@ private fun SecondScreenGroup(host: MenuHost, a: DrawerActions, track: (String) a.secondScreenDisplays.map { it.id to it.label }, a.selectedSecondScreenDisplay, chipModifier = track("second-screen-display"), onPick = a.onSecondScreenDisplay) } + if (a.gameSwapAvailable || a.gameOnBottom) SettingsGroup(stringResource(R.string.swap_game_screen_group)) { + ChoiceRow(host, "game-screen", stringResource(R.string.swap_game_screen), null, + listOf(false to stringResource(R.string.swap_game_screen_top), true to stringResource(R.string.swap_game_screen_bottom)), + a.gameOnBottom, chipModifier = track("game-screen"), onPick = a.onGameOnBottom) + } } @Composable diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt index 8caa4e6dec..b14dd39dc3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsHud.kt @@ -61,11 +61,11 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import com.droiddeck.launcher.R -import com.droiddeck.launcher.hud.DroidDeckMark import com.droiddeck.launcher.hud.FrameStats import com.droiddeck.launcher.hud.HudMetrics import com.droiddeck.launcher.session.StatsHud import java.io.File +import kotlin.math.ceil import kotlin.math.max import kotlin.math.min import kotlin.math.roundToInt @@ -164,10 +164,6 @@ private fun HudPanel(clock: String, right: String?, dim: Boolean, accent: Color, val divider = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = argb(if (dim) 38 else 90, a) } val blur = BlurMaskFilter(4.dp.toPx(), BlurMaskFilter.Blur.NORMAL) val line = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE; strokeWidth = stroke; color = argb(if (dim) 90 else 255, a) } - val markH = min(h, w) * 0.55f - val markX = w - DroidDeckMark.widthFor(markH) - 16.dp.toPx() - val markBody = android.graphics.Color.argb(if (dim) 9 else 20, 255, 255, 255) - val markOrb = argb(if (dim) 9 else 20, a) onDrawBehind { drawIntoCanvas { canvas -> val c = canvas.nativeCanvas @@ -176,7 +172,6 @@ private fun HudPanel(clock: String, right: String?, dim: Boolean, accent: Color, c.clipPath(body) c.drawRect(0f, 0f, w, headerPx + 1f, band) c.drawRect(0f, headerPx, w, headerPx + max(1f, density), divider) - DroidDeckMark.draw(c, markX, (h - markH) / 2f, markH, markBody, markOrb) c.restore() for (pass in 0..2) { line.maskFilter = if (pass < 2) blur else null @@ -189,8 +184,7 @@ private fun HudPanel(clock: String, right: String?, dim: Boolean, accent: Color, .padding(start = 24.dp, end = 34.dp, bottom = 14.dp), ) { Row(Modifier.fillMaxWidth().height(HEADER), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - DroidDeckLogo(16.dp, body = headerInk, orb = if (dim) accent.copy(alpha = 0.5f) else accent) - Text("DroidDeck", fontSize = 14.sp, fontWeight = FontWeight.Bold, color = headerInk, maxLines = 1) + Wordmark(14.dp, ink = headerInk, ball = if (dim) accent.copy(alpha = 0.5f) else accent) if (clock.isNotEmpty()) { Text("·", fontSize = 13.sp, fontFamily = Mono, color = HudInk.sep) Text(clock, fontSize = 13.sp, fontFamily = Mono, fontWeight = FontWeight.Bold, color = HudInk.dim, maxLines = 1) @@ -271,13 +265,18 @@ private fun lowsText(d: HudData, size: TextUnit, accent: Color, deep: Boolean = } } +private val GRAPH_MIN_GAP = 3.dp + @Composable private fun Graph(values: List<Float>, lo: Float, hi: Float, color: Color, modifier: Modifier) { Canvas(modifier) { if (values.size < 2 || hi <= lo) return@Canvas + val stride = ceil(GRAPH_MIN_GAP.toPx() * (values.size - 1) / size.width).toInt().coerceAtLeast(1) + val points = if (stride == 1) values else values.chunked(stride) { it.average().toFloat() } + if (points.size < 2) return@Canvas val path = Path() - values.forEachIndexed { i, v -> - val x = i / (values.size - 1f) * size.width + points.forEachIndexed { i, v -> + val x = i / (points.size - 1f) * size.width val y = size.height - ((v - lo) / (hi - lo)).coerceIn(0f, 1f) * size.height if (i == 0) path.moveTo(x, y) else path.lineTo(x, y) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt index 1d2480688f..fc900a4f56 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt @@ -111,8 +111,7 @@ private fun LogoBadge(size: Dp) { private fun LogoHeader(clock: String, game: String?) { val colors = MaterialTheme.colorScheme Row(Modifier.fillMaxWidth().padding(horizontal = 2.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { - DroidDeckLogo(16.dp) - Text("DroidDeck", fontSize = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) + Wordmark(14.dp, ink = colors.onBackground) Text(game.orEmpty(), fontSize = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, textAlign = TextAlign.Center, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) if (clock.isNotEmpty()) Text(clock, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt b/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt index c0aefad254..887caa3c37 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Wordmark.kt @@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.drawscope.scale import androidx.compose.ui.graphics.drawscope.translate import androidx.compose.ui.graphics.vector.PathParser @@ -16,22 +17,21 @@ import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.Dp import com.droiddeck.launcher.R +import com.droiddeck.launcher.hud.WordmarkArt @Composable -internal fun Wordmark(height: Dp, modifier: Modifier = Modifier) { - val ink = MaterialTheme.colorScheme.onBackground - val ball = LocalPalette.current.signal +internal fun Wordmark(height: Dp, modifier: Modifier = Modifier, ink: Color = MaterialTheme.colorScheme.onBackground, ball: Color = LocalPalette.current.signal) { val name = stringResource(R.string.app_name) - val letters = remember { PathParser().parsePathString(LETTERS).toPath() } - val leftHalf = remember { PathParser().parsePathString(LEFT_HALF).toPath() } - val rightHalf = remember { PathParser().parsePathString(RIGHT_HALF).toPath() } - Canvas(modifier.height(height).width(height * (BOX_W / BOX_H)).semantics { contentDescription = name }) { - val k = size.height / BOX_H + val letters = remember { PathParser().parsePathString(WordmarkArt.LETTERS).toPath() } + val leftHalf = remember { PathParser().parsePathString(WordmarkArt.LEFT_HALF).toPath() } + val rightHalf = remember { PathParser().parsePathString(WordmarkArt.RIGHT_HALF).toPath() } + Canvas(modifier.height(height).width(height * (WordmarkArt.BOX_W / WordmarkArt.BOX_H)).semantics { contentDescription = name }) { + val k = size.height / WordmarkArt.BOX_H scale(k, k, Offset.Zero) { - translate(-BOX_X, -BOX_Y) { + translate(-WordmarkArt.BOX_X, -WordmarkArt.BOX_Y) { drawPath(letters, ink) translate(239.135f, 123.36f) { - scale(MARK_SCALE, MARK_SCALE, Offset.Zero) { + scale(WordmarkArt.MARK_SCALE, WordmarkArt.MARK_SCALE, Offset.Zero) { translate(31.98f, 0f) { drawPath(leftHalf, ink) drawPath(rightHalf, ink) @@ -43,22 +43,3 @@ internal fun Wordmark(height: Dp, modifier: Modifier = Modifier) { } } } - -private const val BOX_X = 239.135f -private const val BOX_Y = 120.02f -private const val BOX_W = 1040.7f - 239.135f -private const val BOX_H = 243.2f - 120.02f -private const val MARK_SCALE = 0.527445f - -private const val LEFT_HALF = "M-31.98 0H56.055V40.489A71.81 71.81 0 0 0 56.055 183.231V223.72H-31.98Z" -private const val RIGHT_HALF = "M71.885 0.28A111.86 111.86 0 0 1 71.885 223.44V183.234A71.81 71.81 0 0 0 71.885 40.486Z" -private const val LETTERS = - "M361.45 241.36V160.13H387.02V241.36ZM387.02 196.73 376.32 188.38Q379.5 174.17 387.02 166.31Q394.54 158.46 407.91 158.46Q413.76 158.46 418.19 160.21Q422.62 161.97 425.96 165.65L410.75 184.87Q409.08 183.03 406.57 182.03Q404.07 181.02 400.89 181.02Q394.54 181.02 390.78 184.95Q387.02 188.88 387.02 196.73" + - "ZM467.91 243.2Q455.38 243.2 445.27 237.6Q435.15 232 429.3 222.31Q423.45 212.61 423.45 200.58Q423.45 188.54 429.3 179.02Q435.15 169.49 445.18 163.89Q455.21 158.29 467.91 158.29Q480.62 158.29 490.64 163.81Q500.67 169.32 506.52 178.93Q512.37 188.54 512.37 200.58Q512.37 212.61 506.52 222.31Q500.67 232 490.64 237.6Q480.62 243.2 467.91 243.2" + - "ZM467.91 219.97Q473.43 219.97 477.61 217.54Q481.79 215.12 484.04 210.69Q486.3 206.26 486.3 200.58Q486.3 194.9 483.96 190.63Q481.62 186.37 477.52 183.95Q473.43 181.52 467.91 181.52Q462.56 181.52 458.39 183.95Q454.21 186.37 451.87 190.72Q449.53 195.06 449.53 200.75Q449.53 206.26 451.87 210.69Q454.21 215.12 458.39 217.54Q462.56 219.97 467.91 219.97" + - "ZM523.4 241.36V160.13H548.98V241.36ZM536.27 148.93Q530.26 148.93 526.33 144.84Q522.4 140.74 522.4 134.89Q522.4 128.88 526.33 124.86Q530.26 120.85 536.27 120.85Q542.29 120.85 546.13 124.86Q549.98 128.88 549.98 134.89Q549.98 140.74 546.13 144.84Q542.29 148.93 536.27 148.93ZM599.95 243.03Q588.42 243.03 579.48 237.52Q570.54 232 565.44 222.47Q560.34 212.95 560.34 200.75Q560.34 188.54 565.44 179.02Q570.54 169.49 579.48 163.97Q588.42 158.46 599.95 158.46Q608.31 158.46 615.08 161.63Q621.85 164.81 626.28 170.41Q630.71 176.01 631.21 183.2V217.46Q630.71 224.65 626.36 230.41Q622.02 236.18 615.16 239.61Q608.31 243.03 599.95 243.03" + - "ZM604.47 219.97Q609.98 219.97 613.99 217.54Q618 215.12 620.34 210.77Q622.68 206.43 622.68 200.75Q622.68 195.06 620.43 190.8Q618.17 186.54 614.08 184.03Q609.98 181.52 604.63 181.52Q599.28 181.52 595.19 184.03Q591.09 186.54 588.67 190.88Q586.25 195.23 586.25 200.75Q586.25 206.26 588.59 210.61Q590.93 214.95 595.11 217.46Q599.28 219.97 604.47 219.97" + - "ZM646.75 241.36H621.68V219.46L625.53 199.74L621.18 180.02V120.02H646.75ZM683.19 241.36V218.29H712.44Q723.13 218.29 731.16 214.03Q739.18 209.77 743.53 201.58Q747.87 193.39 747.87 182.19Q747.87 170.99 743.44 162.97Q739.01 154.95 731.07 150.6Q723.13 146.26 712.44 146.26H682.35V123.36H712.77Q726.14 123.36 737.42 127.62Q748.71 131.88 757.15 139.82Q765.59 147.76 770.18 158.54Q774.78 169.32 774.78 182.36Q774.78 195.23 770.18 206.09Q765.59 216.96 757.23 224.81Q748.87 232.67 737.59 237.01Q726.31 241.36 713.11 241.36" + - "ZM665.47 241.36V123.36H691.71V241.36ZM827.6 243.2Q814.39 243.2 804.11 237.77Q793.83 232.33 787.98 222.64Q782.13 212.95 782.13 200.75Q782.13 188.54 787.9 178.93Q793.67 169.32 803.53 163.81Q813.39 158.29 825.76 158.29Q837.79 158.29 846.98 163.47Q856.18 168.65 861.44 177.85Q866.71 187.04 866.71 198.91Q866.71 201.08 866.46 203.5Q866.21 205.93 865.54 209.1L795.51 209.27V191.72L854.67 191.55L843.64 198.91Q843.47 191.89 841.47 187.29Q839.46 182.69 835.54 180.27Q831.61 177.85 825.92 177.85Q819.91 177.85 815.48 180.61Q811.05 183.36 808.63 188.38Q806.2 193.39 806.2 200.58Q806.2 207.77 808.79 212.86Q811.38 217.96 816.15 220.72Q820.91 223.48 827.43 223.48Q833.45 223.48 838.29 221.39Q843.14 219.3 846.82 215.12L860.86 229.16Q854.84 236.18 846.32 239.69Q837.79 243.2 827.6 243.2" + - "ZM916.68 243.2Q904.15 243.2 893.95 237.68Q883.75 232.17 877.9 222.47Q872.05 212.78 872.05 200.75Q872.05 188.54 877.99 178.93Q883.92 169.32 894.12 163.81Q904.31 158.29 917.02 158.29Q926.54 158.29 934.48 161.55Q942.42 164.81 948.6 171.33L932.22 187.71Q929.38 184.53 925.62 183.03Q921.86 181.52 917.02 181.52Q911.5 181.52 907.24 183.95Q902.98 186.37 900.55 190.63Q898.13 194.9 898.13 200.58Q898.13 206.26 900.55 210.61Q902.98 214.95 907.32 217.46Q911.67 219.97 917.02 219.97Q922.03 219.97 925.96 218.21Q929.88 216.46 932.73 213.28L948.94 229.66Q942.59 236.35 934.56 239.77Q926.54 243.2 916.68 243.2" + - "ZM1010.61 241.36 982.2 199.24 1010.45 160.13H1039.03L1004.93 204.09L1005.77 193.56L1040.7 241.36ZM958.63 241.36V120.02H984.21V241.36Z" diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt b/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt index 59c182dd35..26faded94c 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt +++ b/app/src/main/java/com/droiddeck/launcher/wayland/BottomDesktopCompositorService.kt @@ -20,12 +20,15 @@ class BottomDesktopCompositorService : Service() { private var client: Messenger? = null /** Echoed in every reply, so the session process can tell replies to an earlier attach apart. */ @Volatile private var attachTag = 0 + private var outputWidth = 0 + private var outputHeight = 0 private val handler = object : Handler(Looper.getMainLooper()) { override fun handleMessage(msg: Message) { when (msg.what) { MSG_ATTACH -> attach(msg) MSG_DETACH -> CompositorHost.detach(null) + MSG_RESIZE -> resize(msg.arg1, msg.arg2) MSG_TOUCH -> WaylandCompositor.nativeSendTouch(msg.arg1 and 0xff, msg.arg1 shr 8, msg.arg2 ushr 16, msg.arg2 and 0xffff) MSG_KEY -> WaylandCompositor.nativeSendKey(msg.arg1, msg.arg2) @@ -75,15 +78,26 @@ class BottomDesktopCompositorService : Service() { } val turnip = com.droiddeck.launcher.gpu.TurnipDriver(this) val driverId = if (CompositorHost.isStarted) null else turnip.install() + val resized = CompositorHost.isStarted && (width != outputWidth || height != outputHeight) val started = CompositorHost.startOrAttach( this, surface, runtimeDir.path, driverId?.let { turnip.driverPath(it) }, driverId?.let { turnip.libraryName(it) }, applicationInfo.nativeLibraryDir, width, height, data.getFloat(KEY_REFRESH, 60f), 0, ) + outputWidth = width + outputHeight = height + if (resized) WaylandCompositor.nativeResizeOutput(width, height) Log.i(TAG, (if (started) "compositor started" else "compositor attached") + " at ${width}x$height in ${runtimeDir.path}") reply(MSG_ATTACHED) } + private fun resize(width: Int, height: Int) { + if (width <= 0 || height <= 0 || !CompositorHost.isStarted || (width == outputWidth && height == outputHeight)) return + outputWidth = width + outputHeight = height + WaylandCompositor.nativeResizeOutput(width, height) + } + private fun reply(what: Int) { val target = client ?: return runCatching { target.send(Message.obtain(null, what, attachTag, 0)) } @@ -102,6 +116,7 @@ class BottomDesktopCompositorService : Service() { const val MSG_POINTER = 8 const val MSG_SCENE = 9 const val MSG_CURSOR = 10 + const val MSG_RESIZE = 11 const val MSG_ATTACHED = 101 const val MSG_FIRST_FRAME = 102 const val KEY_RUNTIME_DIR = "runtimeDir" diff --git a/app/src/main/res/drawable/ic_bottom_swap.xml b/app/src/main/res/drawable/ic_bottom_swap.xml new file mode 100644 index 0000000000..e8ef8120df --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_swap.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> + <path android:fillColor="#FFFFFFFF" + android:pathData="M16,17.01V10h-2v7.01h-3L15,21l4,-3.99h-3zM9,3L5,6.99h3V14h2V6.99h3L9,3z" /> +</vector> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 8ef0684fde..96eb4259a0 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3671,6 +3671,19 @@ <string name="integration_shortcuts_service">زر الشاشة الرئيسية في DroidDeck</string> <string name="integration_shortcuts_service_description">يمرّر ضغطات زر الشاشة الرئيسية إلى Steam Guide عندما تكون جلسة Steam في المقدمة ويكون DroidDeck تطبيق الشاشة الرئيسية الافتراضي. لا يقرأ محتوى الشاشة.</string> <string name="integration_brightness_needed">فعّل «السطوع» من الإعداد → تكامل Steam</string> + <string name="setup_gpu_bridge_off">جسر Mali: متوقف</string> + <string name="setup_gpu_bridge_on">جسر Mali: يعمل</string> + <string name="setup_gpu_bridge_detail">%1$s ليس Adreno. جسر Vulkan التجريبي يعمل: تعرض الجلسة الرسومات عبر برنامج تشغيل الهاتف نفسه. توقّع وجود أخطاء؛ أرسل سجلات الجلسة.</string> + <string name="setup_bridge_safe">الوضع الآمن</string> + <string name="setup_bridge_safe_on">الوضع الآمن: يعمل</string> + <string name="setup_bridge_safe_off">الوضع الآمن: متوقف</string> + <string name="setup_bridge_safe_on_detail">الأكثر توافقًا. يوصى به لجهاز جديد.</string> + <string name="setup_bridge_safe_off_detail">أسرع حيث اجتاز معالج الرسومات هذا فحوصاته.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: تلقائي</string> + <string name="setup_bridge_dxvk_proton">DXVK: الخاص بـ Proton</string> + <string name="setup_bridge_dxvk_auto_detail">يستخدم إصدار DXVK أقدم عندما يكون Vulkan في معالج الرسومات هذا أقدم من أن يدعم DXVK الخاص بـ Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">يحتفظ كل Proton بـ DXVK الخاص به، حتى عندما قد يكون Vulkan في معالج الرسومات هذا أقدم من اللازم.</string> <string name="apps_search_hint">البحث في التطبيقات</string> <string name="apps_no_match">لا توجد تطبيقات تطابق ”%1$s“.</string> <string name="apps_add_widget">إضافة أداة</string> diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 9cd7421dcc..0b0942c450 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3536,6 +3536,19 @@ <string name="integration_shortcuts_service">Botón de inicio de DroidDeck</string> <string name="integration_shortcuts_service_description">Pasa las pulsaciones del botón de inicio a Steam Guide mientras una sesión de Steam está en primer plano y DroidDeck es la app de inicio predeterminada. No lee el contenido de la pantalla.</string> <string name="integration_brightness_needed">Activa Brillo en Configuración → Integración con Steam</string> + <string name="setup_gpu_bridge_off">Puente Mali: desactivado</string> + <string name="setup_gpu_bridge_on">Puente Mali: activado</string> + <string name="setup_gpu_bridge_detail">%1$s no es una Adreno. El puente Vulkan experimental está activado: la sesión dibuja a través del propio controlador del teléfono. Espera errores; envía los registros de la sesión.</string> + <string name="setup_bridge_safe">Modo seguro</string> + <string name="setup_bridge_safe_on">Modo seguro: activado</string> + <string name="setup_bridge_safe_off">Modo seguro: desactivado</string> + <string name="setup_bridge_safe_on_detail">El más compatible. Recomendado para un dispositivo nuevo.</string> + <string name="setup_bridge_safe_off_detail">Más rápido donde esta GPU pasó sus pruebas.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automático</string> + <string name="setup_bridge_dxvk_proton">DXVK: el de Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Usa un DXVK más antiguo cuando el Vulkan de esta GPU es demasiado antiguo para el de Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Cada Proton conserva su propio DXVK, aunque el Vulkan de esta GPU pueda ser demasiado antiguo para él.</string> <string name="apps_search_hint">Buscar apps</string> <string name="apps_no_match">Ninguna app coincide con «%1$s».</string> <string name="apps_add_widget">Agregar widget</string> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index a8e1c9f743..9bfdc02cdf 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3527,6 +3527,19 @@ <string name="integration_shortcuts_service">Бутон за начален екран на DroidDeck</string> <string name="integration_shortcuts_service_description">Предава натисканията на бутона за начален екран към Steam Guide, докато сесия на Steam е на фокус и DroidDeck е приложението за начален екран по подразбиране. Не чете съдържанието на екрана.</string> <string name="integration_brightness_needed">Включете „Яркост“ в Настройка → Интеграция със Steam</string> + <string name="setup_gpu_bridge_off">Mali мост: изкл.</string> + <string name="setup_gpu_bridge_on">Mali мост: вкл.</string> + <string name="setup_gpu_bridge_detail">%1$s не е Adreno. Експерименталният Vulkan мост е включен: сесията рисува през собствения драйвер на телефона. Очаквайте грешки; изпратете логовете на сесията.</string> + <string name="setup_bridge_safe">Безопасен режим</string> + <string name="setup_bridge_safe_on">Безопасен режим: вкл.</string> + <string name="setup_bridge_safe_off">Безопасен режим: изкл.</string> + <string name="setup_bridge_safe_on_detail">Най-съвместим. Препоръчва се за ново устройство.</string> + <string name="setup_bridge_safe_off_detail">По-бързо там, където този GPU е минал проверките си.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: автоматично</string> + <string name="setup_bridge_dxvk_proton">DXVK: на Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Използва по-стар DXVK, когато Vulkan на този GPU е твърде стар за този на Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Всеки Proton запазва своя DXVK, дори когато Vulkan на този GPU може да е твърде стар за него.</string> <string name="apps_search_hint">Търсене на приложения</string> <string name="apps_no_match">Няма приложения, отговарящи на „%1$s“.</string> <string name="apps_add_widget">Добавяне на приспособление</string> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b8b3382b2b..78d2002fdd 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3599,6 +3599,19 @@ <string name="integration_shortcuts_service">Tlačítko Domů pro DroidDeck</string> <string name="integration_shortcuts_service_description">Předává stisky tlačítka Domů do Steam Guide, když je aktivní relace Steamu a DroidDeck je výchozí aplikací domovské obrazovky. Nečte obsah obrazovky.</string> <string name="integration_brightness_needed">Zapněte Jas v Příprava → Integrace se Steamem</string> + <string name="setup_gpu_bridge_off">Most Mali: vypnuto</string> + <string name="setup_gpu_bridge_on">Most Mali: zapnuto</string> + <string name="setup_gpu_bridge_detail">%1$s není Adreno. Experimentální most Vulkan je zapnutý: relace vykresluje přes vlastní ovladač telefonu. Počítejte s chybami; pošlete protokoly relace.</string> + <string name="setup_bridge_safe">Bezpečný režim</string> + <string name="setup_bridge_safe_on">Bezpečný režim: zapnuto</string> + <string name="setup_bridge_safe_off">Bezpečný režim: vypnuto</string> + <string name="setup_bridge_safe_on_detail">Nejvyšší kompatibilita. Doporučeno pro nové zařízení.</string> + <string name="setup_bridge_safe_off_detail">Rychlejší tam, kde tento GPU prošel kontrolami.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automaticky</string> + <string name="setup_bridge_dxvk_proton">DXVK: vlastní z Protonu</string> + <string name="setup_bridge_dxvk_auto_detail">Použije starší DXVK, pokud je Vulkan tohoto GPU pro DXVK z Protonu příliš starý.</string> + <string name="setup_bridge_dxvk_proton_detail">Každý Proton si ponechá vlastní DXVK, i když pro něj může být Vulkan tohoto GPU příliš starý.</string> <string name="apps_search_hint">Hledat aplikace</string> <string name="apps_no_match">Výrazu „%1$s“ neodpovídá žádná aplikace.</string> <string name="apps_add_widget">Přidat widget</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 2d4082298e..818d624a2a 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3527,6 +3527,19 @@ <string name="integration_shortcuts_service">DroidDeck Hjem-knap</string> <string name="integration_shortcuts_service_description">Sender tryk på Hjem-knappen til Steam Guide, mens en Steam-session er i fokus, og DroidDeck er standardstartskærmen. Læser ikke skærmindhold.</string> <string name="integration_brightness_needed">Slå Lysstyrke til under Opsætning → Steam-integration</string> + <string name="setup_gpu_bridge_off">Mali-bro: fra</string> + <string name="setup_gpu_bridge_on">Mali-bro: til</string> + <string name="setup_gpu_bridge_detail">%1$s er ikke en Adreno. Den eksperimentelle Vulkan-bro er slået til: sessionen tegner gennem telefonens egen driver. Forvent fejl; send sessionslogfilerne.</string> + <string name="setup_bridge_safe">Sikker tilstand</string> + <string name="setup_bridge_safe_on">Sikker tilstand: til</string> + <string name="setup_bridge_safe_off">Sikker tilstand: fra</string> + <string name="setup_bridge_safe_on_detail">Mest kompatibel. Anbefales til en ny enhed.</string> + <string name="setup_bridge_safe_off_detail">Hurtigere, hvor denne GPU har bestået sine tjek.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatisk</string> + <string name="setup_bridge_dxvk_proton">DXVK: Protons egen</string> + <string name="setup_bridge_dxvk_auto_detail">Bruger en ældre DXVK, hvor denne GPU\'s Vulkan er for gammel til Protons.</string> + <string name="setup_bridge_dxvk_proton_detail">Hver Proton beholder sin egen DXVK, også hvor denne GPU\'s Vulkan kan være for gammel til den.</string> <string name="apps_search_hint">Søg i apps</string> <string name="apps_no_match">Ingen apps matcher “%1$s”.</string> <string name="apps_add_widget">Tilføj widget</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8157b7e1ea..d4d0656069 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3527,6 +3527,19 @@ <string name="integration_shortcuts_service">DroidDeck-Home-Taste</string> <string name="integration_shortcuts_service_description">Leitet Drücke der Home-Taste an Steam Guide weiter, während eine Steam-Sitzung im Fokus ist und DroidDeck die Standard-Startbildschirm-App ist. Liest keine Bildschirminhalte.</string> <string name="integration_brightness_needed">Aktiviere Helligkeit unter Einrichtung → Steam-Integration</string> + <string name="setup_gpu_bridge_off">Mali-Brücke: aus</string> + <string name="setup_gpu_bridge_on">Mali-Brücke: an</string> + <string name="setup_gpu_bridge_detail">%1$s ist kein Adreno. Die experimentelle Vulkan-Brücke ist an: Die Sitzung zeichnet über den eigenen Treiber des Telefons. Rechne mit Fehlern und sende die Sitzungsprotokolle.</string> + <string name="setup_bridge_safe">Sicherer Modus</string> + <string name="setup_bridge_safe_on">Sicherer Modus: an</string> + <string name="setup_bridge_safe_off">Sicherer Modus: aus</string> + <string name="setup_bridge_safe_on_detail">Am kompatibelsten. Empfohlen für ein neues Gerät.</string> + <string name="setup_bridge_safe_off_detail">Schneller, wo diese GPU ihre Prüfungen bestanden hat.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatisch</string> + <string name="setup_bridge_dxvk_proton">DXVK: von Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Nutzt ein älteres DXVK, wenn das Vulkan dieser GPU für das von Proton zu alt ist.</string> + <string name="setup_bridge_dxvk_proton_detail">Jedes Proton behält sein eigenes DXVK, auch wenn das Vulkan dieser GPU dafür zu alt sein könnte.</string> <string name="apps_search_hint">Apps durchsuchen</string> <string name="apps_no_match">Keine Apps passen zu „%1$s“.</string> <string name="apps_add_widget">Widget hinzufügen</string> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index a627bc4168..f14066a2bc 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3527,6 +3527,19 @@ <string name="integration_shortcuts_service">Κουμπί Αρχικής DroidDeck</string> <string name="integration_shortcuts_service_description">Μεταβιβάζει τα πατήματα του κουμπιού Αρχικής στο Steam Guide όσο μια συνεδρία Steam είναι εστιασμένη και το DroidDeck είναι η προεπιλεγμένη εφαρμογή Αρχικής. Δεν διαβάζει το περιεχόμενο της οθόνης.</string> <string name="integration_brightness_needed">Ενεργοποιήστε τη Φωτεινότητα στη Ρύθμιση → Ενσωμάτωση Steam</string> + <string name="setup_gpu_bridge_off">Γέφυρα Mali: ανενεργή</string> + <string name="setup_gpu_bridge_on">Γέφυρα Mali: ενεργή</string> + <string name="setup_gpu_bridge_detail">Η %1$s δεν είναι Adreno. Η πειραματική γέφυρα Vulkan είναι ενεργή: η συνεδρία σχεδιάζει μέσω του προγράμματος οδήγησης του ίδιου του τηλεφώνου. Αναμένετε σφάλματα· στείλτε τα αρχεία καταγραφής της συνεδρίας.</string> + <string name="setup_bridge_safe">Ασφαλής λειτουργία</string> + <string name="setup_bridge_safe_on">Ασφαλής λειτουργία: ενεργή</string> + <string name="setup_bridge_safe_off">Ασφαλής λειτουργία: ανενεργή</string> + <string name="setup_bridge_safe_on_detail">Μέγιστη συμβατότητα. Συνιστάται για νέα συσκευή.</string> + <string name="setup_bridge_safe_off_detail">Ταχύτερη όπου αυτή η GPU πέρασε τους ελέγχους της.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: αυτόματο</string> + <string name="setup_bridge_dxvk_proton">DXVK: του Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Χρησιμοποιεί παλαιότερο DXVK όταν το Vulkan αυτής της GPU είναι πολύ παλιό για αυτό του Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Κάθε Proton κρατά το δικό του DXVK, ακόμη κι αν το Vulkan αυτής της GPU ίσως είναι πολύ παλιό για αυτό.</string> <string name="apps_search_hint">Αναζήτηση εφαρμογών</string> <string name="apps_no_match">Καμία εφαρμογή δεν ταιριάζει με «%1$s».</string> <string name="apps_add_widget">Προσθήκη γραφικού στοιχείου</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index a3247ba1cd..b40c7023c6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3563,6 +3563,19 @@ <string name="integration_shortcuts_service">Botón de inicio de DroidDeck</string> <string name="integration_shortcuts_service_description">Pasa las pulsaciones del botón de inicio a Steam Guide mientras una sesión de Steam está en primer plano y DroidDeck es la app de inicio predeterminada. No lee el contenido de la pantalla.</string> <string name="integration_brightness_needed">Activa Brillo en Configuración → Integración con Steam</string> + <string name="setup_gpu_bridge_off">Puente Mali: desactivado</string> + <string name="setup_gpu_bridge_on">Puente Mali: activado</string> + <string name="setup_gpu_bridge_detail">%1$s no es una Adreno. El puente Vulkan experimental está activado: la sesión dibuja a través del propio controlador del teléfono. Espera errores; envía los registros de la sesión.</string> + <string name="setup_bridge_safe">Modo seguro</string> + <string name="setup_bridge_safe_on">Modo seguro: activado</string> + <string name="setup_bridge_safe_off">Modo seguro: desactivado</string> + <string name="setup_bridge_safe_on_detail">El más compatible. Recomendado para un dispositivo nuevo.</string> + <string name="setup_bridge_safe_off_detail">Más rápido donde esta GPU superó sus comprobaciones.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automático</string> + <string name="setup_bridge_dxvk_proton">DXVK: el de Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Usa un DXVK más antiguo cuando el Vulkan de esta GPU es demasiado antiguo para el de Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Cada Proton conserva su propio DXVK, aunque el Vulkan de esta GPU pueda ser demasiado antiguo para él.</string> <string name="apps_search_hint">Buscar aplicaciones</string> <string name="apps_no_match">Ninguna aplicación coincide con «%1$s».</string> <string name="apps_add_widget">Añadir widget</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index a733c907c8..e68570467a 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3527,6 +3527,19 @@ <string name="integration_shortcuts_service">DroidDeckin Koti-painike</string> <string name="integration_shortcuts_service_description">Välittää Koti-painikkeen painallukset Steam Guidelle, kun Steam-istunto on aktiivinen ja DroidDeck on oletusaloitusnäyttösovellus. Ei lue näytön sisältöä.</string> <string name="integration_brightness_needed">Ota Kirkkaus käyttöön kohdassa Käyttöönotto → Steam-integraatio</string> + <string name="setup_gpu_bridge_off">Mali-silta: pois</string> + <string name="setup_gpu_bridge_on">Mali-silta: päällä</string> + <string name="setup_gpu_bridge_detail">%1$s ei ole Adreno. Kokeellinen Vulkan-silta on päällä: istunto piirtää puhelimen oman ajurin kautta. Odota virheitä; lähetä istunnon lokit.</string> + <string name="setup_bridge_safe">Turvatila</string> + <string name="setup_bridge_safe_on">Turvatila: päällä</string> + <string name="setup_bridge_safe_off">Turvatila: pois</string> + <string name="setup_bridge_safe_on_detail">Yhteensopivin. Suositellaan uudelle laitteelle.</string> + <string name="setup_bridge_safe_off_detail">Nopeampi siellä, missä tämä GPU läpäisi tarkistuksensa.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automaattinen</string> + <string name="setup_bridge_dxvk_proton">DXVK: Protonin oma</string> + <string name="setup_bridge_dxvk_auto_detail">Käyttää vanhempaa DXVK:ta, kun tämän GPU:n Vulkan on liian vanha Protonin omalle.</string> + <string name="setup_bridge_dxvk_proton_detail">Jokainen Proton pitää oman DXVK:nsa, vaikka tämän GPU:n Vulkan voi olla sille liian vanha.</string> <string name="apps_search_hint">Hae sovelluksia</string> <string name="apps_no_match">Mikään sovellus ei vastaa hakua ”%1$s”.</string> <string name="apps_add_widget">Lisää widget</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a59fa6f5ca..c887419609 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3563,6 +3563,19 @@ <string name="integration_shortcuts_service">Bouton Accueil DroidDeck</string> <string name="integration_shortcuts_service_description">Transmet les appuis sur le bouton Accueil à Steam Guide lorsqu\'une session Steam est au premier plan et que DroidDeck est l\'application d\'écran d\'accueil par défaut. Ne lit pas le contenu de l\'écran.</string> <string name="integration_brightness_needed">Activez Luminosité dans Paramètres → Intégration Steam</string> + <string name="setup_gpu_bridge_off">Pont Mali : désactivé</string> + <string name="setup_gpu_bridge_on">Pont Mali : activé</string> + <string name="setup_gpu_bridge_detail">%1$s n\'est pas un Adreno. Le pont Vulkan expérimental est activé : la session dessine via le pilote du téléphone lui-même. Attendez-vous à des bugs ; envoyez les journaux de session.</string> + <string name="setup_bridge_safe">Mode sans échec</string> + <string name="setup_bridge_safe_on">Mode sans échec : activé</string> + <string name="setup_bridge_safe_off">Mode sans échec : désactivé</string> + <string name="setup_bridge_safe_on_detail">Le plus compatible. Recommandé pour un nouvel appareil.</string> + <string name="setup_bridge_safe_off_detail">Plus rapide là où ce GPU a réussi ses vérifications.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK : automatique</string> + <string name="setup_bridge_dxvk_proton">DXVK : celui de Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Utilise un DXVK plus ancien quand le Vulkan de ce GPU est trop ancien pour celui de Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Chaque Proton garde son propre DXVK, même quand le Vulkan de ce GPU risque d\'être trop ancien pour lui.</string> <string name="apps_search_hint">Rechercher des applications</string> <string name="apps_no_match">Aucune application ne correspond à « %1$s ».</string> <string name="apps_add_widget">Ajouter un widget</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index c6325ed999..795c2c35d0 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3527,6 +3527,19 @@ <string name="integration_shortcuts_service">DroidDeck होम बटन</string> <string name="integration_shortcuts_service_description">जब Steam सेशन फ़ोकस में हो और DroidDeck डिफ़ॉल्ट होम ऐप हो, तब होम बटन दबाने को Steam Guide तक भेजता है। स्क्रीन की सामग्री नहीं पढ़ता।</string> <string name="integration_brightness_needed">Setup → Steam इंटीग्रेशन में ब्राइटनेस चालू करें</string> + <string name="setup_gpu_bridge_off">Mali ब्रिज: बंद</string> + <string name="setup_gpu_bridge_on">Mali ब्रिज: चालू</string> + <string name="setup_gpu_bridge_detail">%1$s Adreno नहीं है। प्रायोगिक Vulkan ब्रिज चालू है: सत्र फ़ोन के अपने ड्राइवर से ड्रॉ करता है। बग की उम्मीद रखें; सत्र लॉग भेजें।</string> + <string name="setup_bridge_safe">सुरक्षित मोड</string> + <string name="setup_bridge_safe_on">सुरक्षित मोड: चालू</string> + <string name="setup_bridge_safe_off">सुरक्षित मोड: बंद</string> + <string name="setup_bridge_safe_on_detail">सबसे अधिक संगत। नए डिवाइस के लिए अनुशंसित।</string> + <string name="setup_bridge_safe_off_detail">जहाँ इस GPU ने अपनी जाँचें पास कीं, वहाँ तेज़।</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: स्वचालित</string> + <string name="setup_bridge_dxvk_proton">DXVK: Proton का अपना</string> + <string name="setup_bridge_dxvk_auto_detail">जहाँ इस GPU का Vulkan Proton के DXVK के लिए बहुत पुराना है, वहाँ पुराना DXVK इस्तेमाल करता है।</string> + <string name="setup_bridge_dxvk_proton_detail">हर Proton अपना DXVK रखता है, भले ही इस GPU का Vulkan उसके लिए बहुत पुराना हो।</string> <string name="apps_search_hint">ऐप खोजें</string> <string name="apps_no_match">“%1$s” से कोई ऐप मेल नहीं खाता।</string> <string name="apps_add_widget">विजेट जोड़ें</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f35b74f262..8a0a742f55 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3527,6 +3527,19 @@ <string name="integration_shortcuts_service">DroidDeck Kezdőképernyő gomb</string> <string name="integration_shortcuts_service_description">A Kezdőképernyő gomb lenyomásait továbbítja a Steam Guide-nak, amíg egy Steam-munkamenet van fókuszban, és a DroidDeck az alapértelmezett kezdőképernyő alkalmazás. Nem olvassa a képernyő tartalmát.</string> <string name="integration_brightness_needed">Kapcsolja be a Fényerőt itt: Beállítás → Steam-integráció</string> + <string name="setup_gpu_bridge_off">Mali híd: ki</string> + <string name="setup_gpu_bridge_on">Mali híd: be</string> + <string name="setup_gpu_bridge_detail">A(z) %1$s nem Adreno. A kísérleti Vulkan híd be van kapcsolva: a munkamenet a telefon saját illesztőprogramján keresztül rajzol. Hibákra számíts; küldd el a munkamenet naplóit.</string> + <string name="setup_bridge_safe">Biztonságos mód</string> + <string name="setup_bridge_safe_on">Biztonságos mód: be</string> + <string name="setup_bridge_safe_off">Biztonságos mód: ki</string> + <string name="setup_bridge_safe_on_detail">A legjobb kompatibilitás. Új eszközhöz ajánlott.</string> + <string name="setup_bridge_safe_off_detail">Gyorsabb ott, ahol ez a GPU átment az ellenőrzéseken.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatikus</string> + <string name="setup_bridge_dxvk_proton">DXVK: a Protoné</string> + <string name="setup_bridge_dxvk_auto_detail">Régebbi DXVK-t használ, ha ennek a GPU-nak a Vulkanja túl régi a Proton sajátjához.</string> + <string name="setup_bridge_dxvk_proton_detail">Minden Proton megtartja a saját DXVK-ját, akkor is, ha ennek a GPU-nak a Vulkanja túl régi lehet hozzá.</string> <string name="apps_search_hint">Alkalmazások keresése</string> <string name="apps_no_match">Egy alkalmazás sem felel meg ennek: „%1$s”.</string> <string name="apps_add_widget">Modul hozzáadása</string> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 90d529218a..31064ee629 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3500,6 +3500,19 @@ <string name="integration_shortcuts_service">Tombol Home DroidDeck</string> <string name="integration_shortcuts_service_description">Meneruskan tekanan tombol Home ke Steam Guide saat sesi Steam sedang aktif dan DroidDeck adalah aplikasi Beranda default. Tidak membaca konten layar.</string> <string name="integration_brightness_needed">Aktifkan Kecerahan di Penyiapan → Integrasi Steam</string> + <string name="setup_gpu_bridge_off">Jembatan Mali: mati</string> + <string name="setup_gpu_bridge_on">Jembatan Mali: nyala</string> + <string name="setup_gpu_bridge_detail">%1$s bukan Adreno. Jembatan Vulkan eksperimental menyala: sesi menggambar melalui driver ponsel itu sendiri. Bersiaplah menemui bug; kirim log sesi.</string> + <string name="setup_bridge_safe">Mode aman</string> + <string name="setup_bridge_safe_on">Mode aman: nyala</string> + <string name="setup_bridge_safe_off">Mode aman: mati</string> + <string name="setup_bridge_safe_on_detail">Paling kompatibel. Disarankan untuk perangkat baru.</string> + <string name="setup_bridge_safe_off_detail">Lebih cepat di bagian yang lolos pemeriksaan GPU ini.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: otomatis</string> + <string name="setup_bridge_dxvk_proton">DXVK: bawaan Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Memakai DXVK lebih lama jika Vulkan GPU ini terlalu lama untuk DXVK bawaan Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Setiap Proton tetap memakai DXVK bawaannya, meski Vulkan GPU ini mungkin terlalu lama untuknya.</string> <string name="apps_search_hint">Cari aplikasi</string> <string name="apps_no_match">Tidak ada aplikasi yang cocok dengan “%1$s”.</string> <string name="apps_add_widget">Tambahkan widget</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 2a0664db65..d65453a097 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3563,6 +3563,19 @@ <string name="integration_shortcuts_service">Tasto Home di DroidDeck</string> <string name="integration_shortcuts_service_description">Inoltra le pressioni del tasto Home a Steam Guide mentre una sessione Steam è in primo piano e DroidDeck è l\'app Home predefinita. Non legge il contenuto dello schermo.</string> <string name="integration_brightness_needed">Attiva Luminosità in Configurazione → Integrazione con Steam</string> + <string name="setup_gpu_bridge_off">Ponte Mali: disattivato</string> + <string name="setup_gpu_bridge_on">Ponte Mali: attivo</string> + <string name="setup_gpu_bridge_detail">%1$s non è una Adreno. Il ponte Vulkan sperimentale è attivo: la sessione disegna tramite il driver del telefono. Aspettati bug; invia i log della sessione.</string> + <string name="setup_bridge_safe">Modalità sicura</string> + <string name="setup_bridge_safe_on">Modalità sicura: attiva</string> + <string name="setup_bridge_safe_off">Modalità sicura: disattivata</string> + <string name="setup_bridge_safe_on_detail">La più compatibile. Consigliata per un nuovo dispositivo.</string> + <string name="setup_bridge_safe_off_detail">Più veloce dove questa GPU ha superato i controlli.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatico</string> + <string name="setup_bridge_dxvk_proton">DXVK: quello di Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Usa un DXVK più vecchio se il Vulkan di questa GPU è troppo vecchio per quello di Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Ogni Proton mantiene il proprio DXVK, anche se il Vulkan di questa GPU potrebbe essere troppo vecchio.</string> <string name="apps_search_hint">Cerca app</string> <string name="apps_no_match">Nessuna app corrisponde a «%1$s».</string> <string name="apps_add_widget">Aggiungi widget</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ed27707c11..b6de8491d0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3500,6 +3500,19 @@ <string name="integration_shortcuts_service">DroidDeckホームボタン</string> <string name="integration_shortcuts_service_description">Steamセッションがフォーカスされ、DroidDeckがデフォルトのホームアプリの場合に、ホームボタンの操作をSteamガイドに渡します。画面のコンテンツは読み取りません。</string> <string name="integration_brightness_needed">「セットアップ」→「Steam連携」で明るさをオンにしてください</string> + <string name="setup_gpu_bridge_off">Mali ブリッジ: オフ</string> + <string name="setup_gpu_bridge_on">Mali ブリッジ: オン</string> + <string name="setup_gpu_bridge_detail">%1$s は Adreno ではありません。試験的な Vulkan ブリッジがオンです。セッションはスマートフォン本体のドライバーで描画します。不具合が出る可能性があります。セッションログを送ってください。</string> + <string name="setup_bridge_safe">セーフモード</string> + <string name="setup_bridge_safe_on">セーフモード: オン</string> + <string name="setup_bridge_safe_off">セーフモード: オフ</string> + <string name="setup_bridge_safe_on_detail">最も互換性が高い設定です。新しいデバイスにおすすめです。</string> + <string name="setup_bridge_safe_off_detail">この GPU がチェックに合格した部分で高速になります。</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: 自動</string> + <string name="setup_bridge_dxvk_proton">DXVK: Proton 付属</string> + <string name="setup_bridge_dxvk_auto_detail">この GPU の Vulkan が Proton 付属の DXVK には古すぎる場合、古い DXVK を使います。</string> + <string name="setup_bridge_dxvk_proton_detail">この GPU の Vulkan が古すぎる場合でも、各 Proton は付属の DXVK を使い続けます。</string> <string name="apps_search_hint">アプリを検索</string> <string name="apps_no_match">「%1$s」に一致するアプリはありません。</string> <string name="apps_add_widget">ウィジェットを追加</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 821641cab2..5179b8a361 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3500,6 +3500,19 @@ <string name="integration_shortcuts_service">DroidDeck 홈 버튼</string> <string name="integration_shortcuts_service_description">Steam 세션에 포커스가 있고 DroidDeck이 기본 홈 앱일 때 홈 버튼 입력을 Steam Guide로 전달합니다. 화면 콘텐츠는 읽지 않습니다.</string> <string name="integration_brightness_needed">설정 → Steam 연동에서 밝기를 켜세요</string> + <string name="setup_gpu_bridge_off">Mali 브리지: 끔</string> + <string name="setup_gpu_bridge_on">Mali 브리지: 켬</string> + <string name="setup_gpu_bridge_detail">%1$s은(는) Adreno가 아닙니다. 실험적 Vulkan 브리지가 켜져 있어 세션이 휴대폰 자체 드라이버로 그립니다. 버그가 있을 수 있으니 세션 로그를 보내 주세요.</string> + <string name="setup_bridge_safe">안전 모드</string> + <string name="setup_bridge_safe_on">안전 모드: 켬</string> + <string name="setup_bridge_safe_off">안전 모드: 끔</string> + <string name="setup_bridge_safe_on_detail">호환성이 가장 높습니다. 새 기기에 권장합니다.</string> + <string name="setup_bridge_safe_off_detail">이 GPU가 검사를 통과한 부분에서 더 빠릅니다.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: 자동</string> + <string name="setup_bridge_dxvk_proton">DXVK: Proton 기본</string> + <string name="setup_bridge_dxvk_auto_detail">이 GPU의 Vulkan이 Proton 기본 DXVK에 너무 오래된 경우 이전 DXVK를 사용합니다.</string> + <string name="setup_bridge_dxvk_proton_detail">이 GPU의 Vulkan이 너무 오래되었을 수 있어도 각 Proton은 자체 DXVK를 유지합니다.</string> <string name="apps_search_hint">앱 검색</string> <string name="apps_no_match">‘%1$s’와(과) 일치하는 앱이 없습니다.</string> <string name="apps_add_widget">위젯 추가</string> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 1d2b2ff463..8da0845006 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3500,6 +3500,19 @@ <string name="integration_shortcuts_service">Butang Laman Utama DroidDeck</string> <string name="integration_shortcuts_service_description">Menghantar tekanan butang Laman Utama kepada Steam Guide semasa sesi Steam difokuskan dan DroidDeck ialah apl Laman Utama lalai. Tidak membaca kandungan skrin.</string> <string name="integration_brightness_needed">Hidupkan Kecerahan dalam Persediaan → Integrasi Steam</string> + <string name="setup_gpu_bridge_off">Jambatan Mali: mati</string> + <string name="setup_gpu_bridge_on">Jambatan Mali: hidup</string> + <string name="setup_gpu_bridge_detail">%1$s bukan Adreno. Jambatan Vulkan eksperimen dihidupkan: sesi melukis melalui pemacu telefon itu sendiri. Jangkakan pepijat; hantar log sesi.</string> + <string name="setup_bridge_safe">Mod selamat</string> + <string name="setup_bridge_safe_on">Mod selamat: hidup</string> + <string name="setup_bridge_safe_off">Mod selamat: mati</string> + <string name="setup_bridge_safe_on_detail">Paling serasi. Disyorkan untuk peranti baharu.</string> + <string name="setup_bridge_safe_off_detail">Lebih pantas di bahagian yang lulus semakan GPU ini.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatik</string> + <string name="setup_bridge_dxvk_proton">DXVK: milik Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Menggunakan DXVK yang lebih lama jika Vulkan GPU ini terlalu lama untuk DXVK Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Setiap Proton mengekalkan DXVK sendiri, walaupun Vulkan GPU ini mungkin terlalu lama untuknya.</string> <string name="apps_search_hint">Cari apl</string> <string name="apps_no_match">Tiada apl sepadan dengan “%1$s”.</string> <string name="apps_add_widget">Tambah widget</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index c0ecc73a29..62207f520d 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3527,6 +3527,19 @@ <string name="integration_shortcuts_service">DroidDeck Hjem-knapp</string> <string name="integration_shortcuts_service_description">Sender trykk på Hjem-knappen til Steam Guide mens en Steam-sesjon er i fokus og DroidDeck er standard startskjerm-app. Leser ikke skjerminnhold.</string> <string name="integration_brightness_needed">Slå på Lysstyrke i Oppsett → Steam-integrering</string> + <string name="setup_gpu_bridge_off">Mali-bro: av</string> + <string name="setup_gpu_bridge_on">Mali-bro: på</string> + <string name="setup_gpu_bridge_detail">%1$s er ikke en Adreno. Den eksperimentelle Vulkan-broen er på: økten tegner gjennom telefonens egen driver. Forvent feil; send øktloggene.</string> + <string name="setup_bridge_safe">Sikker modus</string> + <string name="setup_bridge_safe_on">Sikker modus: på</string> + <string name="setup_bridge_safe_off">Sikker modus: av</string> + <string name="setup_bridge_safe_on_detail">Mest kompatibel. Anbefales for en ny enhet.</string> + <string name="setup_bridge_safe_off_detail">Raskere der denne GPU-en besto kontrollene sine.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatisk</string> + <string name="setup_bridge_dxvk_proton">DXVK: Protons egen</string> + <string name="setup_bridge_dxvk_auto_detail">Bruker en eldre DXVK der denne GPU-ens Vulkan er for gammel for Protons.</string> + <string name="setup_bridge_dxvk_proton_detail">Hver Proton beholder sin egen DXVK, selv der denne GPU-ens Vulkan kan være for gammel for den.</string> <string name="apps_search_hint">Søk i apper</string> <string name="apps_no_match">Ingen apper samsvarer med «%1$s».</string> <string name="apps_add_widget">Legg til modul</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 576631973c..7fc8cd9229 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3527,6 +3527,19 @@ <string name="integration_shortcuts_service">DroidDeck-startknop</string> <string name="integration_shortcuts_service_description">Geeft drukken op de startknop door aan Steam Guide terwijl een Steam-sessie actief is en DroidDeck de standaard startscherm-app is. Leest geen scherminhoud.</string> <string name="integration_brightness_needed">Zet Helderheid aan in Installatie → Steam-integratie</string> + <string name="setup_gpu_bridge_off">Mali-brug: uit</string> + <string name="setup_gpu_bridge_on">Mali-brug: aan</string> + <string name="setup_gpu_bridge_detail">%1$s is geen Adreno. De experimentele Vulkan-brug staat aan: de sessie tekent via het eigen stuurprogramma van de telefoon. Verwacht fouten; stuur de sessielogboeken.</string> + <string name="setup_bridge_safe">Veilige modus</string> + <string name="setup_bridge_safe_on">Veilige modus: aan</string> + <string name="setup_bridge_safe_off">Veilige modus: uit</string> + <string name="setup_bridge_safe_on_detail">Meest compatibel. Aanbevolen voor een nieuw apparaat.</string> + <string name="setup_bridge_safe_off_detail">Sneller waar deze GPU zijn controles heeft doorstaan.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatisch</string> + <string name="setup_bridge_dxvk_proton">DXVK: die van Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Gebruikt een oudere DXVK als de Vulkan van deze GPU te oud is voor die van Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Elke Proton houdt zijn eigen DXVK, ook als de Vulkan van deze GPU daarvoor te oud kan zijn.</string> <string name="apps_search_hint">Apps zoeken</string> <string name="apps_no_match">Geen apps gevonden voor ‘%1$s’.</string> <string name="apps_add_widget">Widget toevoegen</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 93b8a830ed..56f9e0d1f2 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3599,6 +3599,19 @@ <string name="integration_shortcuts_service">Przycisk ekranu głównego DroidDeck</string> <string name="integration_shortcuts_service_description">Przekazuje naciśnięcia przycisku ekranu głównego do Steam Guide, gdy aktywna jest sesja Steam, a DroidDeck jest domyślną aplikacją ekranu głównego. Nie odczytuje zawartości ekranu.</string> <string name="integration_brightness_needed">Włącz Jasność w Konfiguracja → Integracja ze Steam</string> + <string name="setup_gpu_bridge_off">Most Mali: wył.</string> + <string name="setup_gpu_bridge_on">Most Mali: wł.</string> + <string name="setup_gpu_bridge_detail">%1$s to nie Adreno. Eksperymentalny most Vulkan jest włączony: sesja rysuje przez własny sterownik telefonu. Spodziewaj się błędów; wyślij logi sesji.</string> + <string name="setup_bridge_safe">Tryb bezpieczny</string> + <string name="setup_bridge_safe_on">Tryb bezpieczny: wł.</string> + <string name="setup_bridge_safe_off">Tryb bezpieczny: wył.</string> + <string name="setup_bridge_safe_on_detail">Największa zgodność. Zalecany dla nowego urządzenia.</string> + <string name="setup_bridge_safe_off_detail">Szybciej tam, gdzie ten GPU przeszedł testy.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatycznie</string> + <string name="setup_bridge_dxvk_proton">DXVK: z Protona</string> + <string name="setup_bridge_dxvk_auto_detail">Używa starszego DXVK, gdy Vulkan tego GPU jest za stary dla DXVK z Protona.</string> + <string name="setup_bridge_dxvk_proton_detail">Każdy Proton zachowuje własny DXVK, nawet jeśli Vulkan tego GPU może być dla niego za stary.</string> <string name="apps_search_hint">Szukaj aplikacji</string> <string name="apps_no_match">Żadna aplikacja nie pasuje do „%1$s”.</string> <string name="apps_add_widget">Dodaj widżet</string> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 5640c1c578..ff09a5aad6 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3563,6 +3563,19 @@ <string name="integration_shortcuts_service">Botão Página inicial do DroidDeck</string> <string name="integration_shortcuts_service_description">Envia os toques no botão Página inicial para o Guide do Steam enquanto uma sessão do Steam está em foco e o DroidDeck é a app de página inicial predefinida. Não lê o conteúdo do ecrã.</string> <string name="integration_brightness_needed">Ative Brilho em Configuração → Integração com o Steam</string> + <string name="setup_gpu_bridge_off">Ponte Mali: desligada</string> + <string name="setup_gpu_bridge_on">Ponte Mali: ligada</string> + <string name="setup_gpu_bridge_detail">%1$s não é uma Adreno. A ponte Vulkan experimental está ligada: a sessão desenha através do próprio controlador do telemóvel. Conte com erros; envie os registos da sessão.</string> + <string name="setup_bridge_safe">Modo seguro</string> + <string name="setup_bridge_safe_on">Modo seguro: ligado</string> + <string name="setup_bridge_safe_off">Modo seguro: desligado</string> + <string name="setup_bridge_safe_on_detail">O mais compatível. Recomendado para um dispositivo novo.</string> + <string name="setup_bridge_safe_off_detail">Mais rápido onde esta GPU passou nas verificações.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automático</string> + <string name="setup_bridge_dxvk_proton">DXVK: o do Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Usa um DXVK mais antigo quando o Vulkan desta GPU é demasiado antigo para o do Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Cada Proton mantém o seu próprio DXVK, mesmo quando o Vulkan desta GPU pode ser demasiado antigo para ele.</string> <string name="apps_search_hint">Pesquisar aplicações</string> <string name="apps_no_match">Nenhuma aplicação corresponde a “%1$s”.</string> <string name="apps_add_widget">Adicionar widget</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index fa704f1e34..a6f9e5cc9b 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3563,6 +3563,19 @@ <string name="integration_shortcuts_service">Botão Início do DroidDeck</string> <string name="integration_shortcuts_service_description">Repassa os toques no botão Início para o Guide da Steam enquanto uma sessão da Steam está em foco e o DroidDeck é o app de tela inicial padrão. Não lê o conteúdo da tela.</string> <string name="integration_brightness_needed">Ative Brilho em Configuração → Integração com a Steam</string> + <string name="setup_gpu_bridge_off">Ponte Mali: desligada</string> + <string name="setup_gpu_bridge_on">Ponte Mali: ligada</string> + <string name="setup_gpu_bridge_detail">%1$s não é uma Adreno. A ponte Vulkan experimental está ligada: a sessão desenha pelo próprio driver do celular. Espere bugs; envie os logs da sessão.</string> + <string name="setup_bridge_safe">Modo seguro</string> + <string name="setup_bridge_safe_on">Modo seguro: ligado</string> + <string name="setup_bridge_safe_off">Modo seguro: desligado</string> + <string name="setup_bridge_safe_on_detail">O mais compatível. Recomendado para um dispositivo novo.</string> + <string name="setup_bridge_safe_off_detail">Mais rápido onde esta GPU passou nas verificações.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automático</string> + <string name="setup_bridge_dxvk_proton">DXVK: o do Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Usa um DXVK mais antigo quando o Vulkan desta GPU é antigo demais para o do Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Cada Proton mantém o próprio DXVK, mesmo quando o Vulkan desta GPU pode ser antigo demais para ele.</string> <string name="apps_search_hint">Pesquisar apps</string> <string name="apps_no_match">Nenhum app corresponde a “%1$s”.</string> <string name="apps_add_widget">Adicionar widget</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index fafe91aab3..2eecc56e30 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3563,6 +3563,19 @@ <string name="integration_shortcuts_service">Butonul Acasă DroidDeck</string> <string name="integration_shortcuts_service_description">Transmite apăsările butonului Acasă către Steam Guide cât timp o sesiune Steam este activă și DroidDeck este aplicația Acasă implicită. Nu citește conținutul ecranului.</string> <string name="integration_brightness_needed">Activează Luminozitate în Configurare → Integrare Steam</string> + <string name="setup_gpu_bridge_off">Punte Mali: oprită</string> + <string name="setup_gpu_bridge_on">Punte Mali: pornită</string> + <string name="setup_gpu_bridge_detail">%1$s nu este Adreno. Puntea Vulkan experimentală este pornită: sesiunea desenează prin driverul propriu al telefonului. Așteaptă-te la erori; trimite jurnalele sesiunii.</string> + <string name="setup_bridge_safe">Mod sigur</string> + <string name="setup_bridge_safe_on">Mod sigur: pornit</string> + <string name="setup_bridge_safe_off">Mod sigur: oprit</string> + <string name="setup_bridge_safe_on_detail">Cel mai compatibil. Recomandat pentru un dispozitiv nou.</string> + <string name="setup_bridge_safe_off_detail">Mai rapid acolo unde acest GPU a trecut verificările.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automat</string> + <string name="setup_bridge_dxvk_proton">DXVK: al Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Folosește un DXVK mai vechi când Vulkan-ul acestui GPU este prea vechi pentru cel din Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Fiecare Proton își păstrează propriul DXVK, chiar dacă Vulkan-ul acestui GPU poate fi prea vechi pentru el.</string> <string name="apps_search_hint">Caută aplicații</string> <string name="apps_no_match">Nicio aplicație nu se potrivește cu „%1$s”.</string> <string name="apps_add_widget">Adaugă widget</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index d31b5b54ab..2187225f6d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3599,6 +3599,19 @@ <string name="integration_shortcuts_service">Кнопка «Домой» DroidDeck</string> <string name="integration_shortcuts_service_description">Передаёт нажатия кнопки «Домой» в Steam Guide, пока активна сессия Steam и DroidDeck является главным экраном по умолчанию. Не считывает содержимое экрана.</string> <string name="integration_brightness_needed">Включите «Яркость» в «Настройка → Интеграция со Steam»</string> + <string name="setup_gpu_bridge_off">Мост Mali: выкл.</string> + <string name="setup_gpu_bridge_on">Мост Mali: вкл.</string> + <string name="setup_gpu_bridge_detail">%1$s — не Adreno. Включён экспериментальный мост Vulkan: сеанс рисует через собственный драйвер телефона. Возможны ошибки; отправьте журналы сеанса.</string> + <string name="setup_bridge_safe">Безопасный режим</string> + <string name="setup_bridge_safe_on">Безопасный режим: вкл.</string> + <string name="setup_bridge_safe_off">Безопасный режим: выкл.</string> + <string name="setup_bridge_safe_on_detail">Максимальная совместимость. Рекомендуется для нового устройства.</string> + <string name="setup_bridge_safe_off_detail">Быстрее там, где этот GPU прошёл проверки.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: автоматически</string> + <string name="setup_bridge_dxvk_proton">DXVK: из Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Использует более старый DXVK, если Vulkan этого GPU слишком стар для DXVK из Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Каждый Proton оставляет свой DXVK, даже если Vulkan этого GPU может быть для него слишком старым.</string> <string name="apps_search_hint">Поиск приложений</string> <string name="apps_no_match">Нет приложений по запросу «%1$s».</string> <string name="apps_add_widget">Добавить виджет</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 645c25857d..6ce5d82b87 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3527,6 +3527,19 @@ <string name="integration_shortcuts_service">DroidDeck hemknapp</string> <string name="integration_shortcuts_service_description">Skickar tryck på hemknappen till Steam Guide medan en Steam-session är i fokus och DroidDeck är standardappen för startskärmen. Läser inte skärminnehåll.</string> <string name="integration_brightness_needed">Slå på Ljusstyrka under Konfiguration → Steam-integration</string> + <string name="setup_gpu_bridge_off">Mali-brygga: av</string> + <string name="setup_gpu_bridge_on">Mali-brygga: på</string> + <string name="setup_gpu_bridge_detail">%1$s är inte en Adreno. Den experimentella Vulkan-bryggan är på: sessionen ritar via telefonens egen drivrutin. Räkna med buggar; skicka sessionsloggarna.</string> + <string name="setup_bridge_safe">Säkert läge</string> + <string name="setup_bridge_safe_on">Säkert läge: på</string> + <string name="setup_bridge_safe_off">Säkert läge: av</string> + <string name="setup_bridge_safe_on_detail">Mest kompatibelt. Rekommenderas för en ny enhet.</string> + <string name="setup_bridge_safe_off_detail">Snabbare där den här GPU:n klarade sina kontroller.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatiskt</string> + <string name="setup_bridge_dxvk_proton">DXVK: Protons egen</string> + <string name="setup_bridge_dxvk_auto_detail">Använder en äldre DXVK när den här GPU:ns Vulkan är för gammal för Protons.</string> + <string name="setup_bridge_dxvk_proton_detail">Varje Proton behåller sin egen DXVK, även där den här GPU:ns Vulkan kan vara för gammal för den.</string> <string name="apps_search_hint">Sök appar</string> <string name="apps_no_match">Inga appar matchar ”%1$s”.</string> <string name="apps_add_widget">Lägg till widget</string> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 41318ab7c5..0c44a3bc29 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3500,6 +3500,19 @@ <string name="integration_shortcuts_service">ปุ่มหน้าหลัก DroidDeck</string> <string name="integration_shortcuts_service_description">ส่งการกดปุ่มหน้าหลักไปยัง Steam Guide ขณะเซสชัน Steam อยู่ในโฟกัสและ DroidDeck เป็นแอปหน้าหลักเริ่มต้น ไม่อ่านเนื้อหาบนหน้าจอ</string> <string name="integration_brightness_needed">เปิดความสว่างในการตั้งค่า → การผสานรวม Steam</string> + <string name="setup_gpu_bridge_off">บริดจ์ Mali: ปิด</string> + <string name="setup_gpu_bridge_on">บริดจ์ Mali: เปิด</string> + <string name="setup_gpu_bridge_detail">%1$s ไม่ใช่ Adreno บริดจ์ Vulkan รุ่นทดลองเปิดอยู่: เซสชันวาดผ่านไดรเวอร์ของโทรศัพท์เอง อาจพบบั๊ก โปรดส่งบันทึกของเซสชัน</string> + <string name="setup_bridge_safe">โหมดปลอดภัย</string> + <string name="setup_bridge_safe_on">โหมดปลอดภัย: เปิด</string> + <string name="setup_bridge_safe_off">โหมดปลอดภัย: ปิด</string> + <string name="setup_bridge_safe_on_detail">เข้ากันได้มากที่สุด แนะนำสำหรับอุปกรณ์ใหม่</string> + <string name="setup_bridge_safe_off_detail">เร็วขึ้นในส่วนที่ GPU นี้ผ่านการตรวจสอบ</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: อัตโนมัติ</string> + <string name="setup_bridge_dxvk_proton">DXVK: ของ Proton</string> + <string name="setup_bridge_dxvk_auto_detail">ใช้ DXVK รุ่นเก่ากว่าเมื่อ Vulkan ของ GPU นี้เก่าเกินไปสำหรับ DXVK ของ Proton</string> + <string name="setup_bridge_dxvk_proton_detail">Proton แต่ละตัวใช้ DXVK ของตัวเอง แม้ Vulkan ของ GPU นี้อาจเก่าเกินไปสำหรับมัน</string> <string name="apps_search_hint">ค้นหาแอป</string> <string name="apps_no_match">ไม่มีแอปที่ตรงกับ “%1$s”</string> <string name="apps_add_widget">เพิ่มวิดเจ็ต</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index e8347fab3d..16ca82a756 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3527,6 +3527,19 @@ <string name="integration_shortcuts_service">DroidDeck Ana ekran düğmesi</string> <string name="integration_shortcuts_service_description">Bir Steam oturumu odaktayken ve DroidDeck varsayılan Ana ekran uygulamasıyken Ana ekran düğmesine basışları Steam Guide\'a iletir. Ekran içeriğini okumaz.</string> <string name="integration_brightness_needed">Kurulum → Steam entegrasyonu bölümünde Parlaklık\'ı açın</string> + <string name="setup_gpu_bridge_off">Mali köprüsü: kapalı</string> + <string name="setup_gpu_bridge_on">Mali köprüsü: açık</string> + <string name="setup_gpu_bridge_detail">%1$s bir Adreno değil. Deneysel Vulkan köprüsü açık: oturum, telefonun kendi sürücüsü üzerinden çizer. Hatalar olabilir; oturum günlüklerini gönderin.</string> + <string name="setup_bridge_safe">Güvenli mod</string> + <string name="setup_bridge_safe_on">Güvenli mod: açık</string> + <string name="setup_bridge_safe_off">Güvenli mod: kapalı</string> + <string name="setup_bridge_safe_on_detail">En uyumlu. Yeni bir cihaz için önerilir.</string> + <string name="setup_bridge_safe_off_detail">Bu GPU\'nun kontrollerini geçtiği yerlerde daha hızlı.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: otomatik</string> + <string name="setup_bridge_dxvk_proton">DXVK: Proton\'unki</string> + <string name="setup_bridge_dxvk_auto_detail">Bu GPU\'nun Vulkan\'ı Proton\'un DXVK\'sı için çok eskiyse daha eski bir DXVK kullanır.</string> + <string name="setup_bridge_dxvk_proton_detail">Bu GPU\'nun Vulkan\'ı onun için çok eski olsa bile her Proton kendi DXVK\'sını korur.</string> <string name="apps_search_hint">Uygulama ara</string> <string name="apps_no_match">“%1$s” ile eşleşen uygulama yok.</string> <string name="apps_add_widget">Widget ekle</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index d4aa241f24..bd17807290 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3599,6 +3599,19 @@ <string name="integration_shortcuts_service">Кнопка «Додому» DroidDeck</string> <string name="integration_shortcuts_service_description">Передає натискання кнопки «Додому» в Steam Guide, поки активний сеанс Steam і DroidDeck є типовим головним екраном. Не зчитує вміст екрана.</string> <string name="integration_brightness_needed">Увімкніть «Яскравість» у «Налаштування → Інтеграція зі Steam»</string> + <string name="setup_gpu_bridge_off">Міст Mali: вимк.</string> + <string name="setup_gpu_bridge_on">Міст Mali: увімк.</string> + <string name="setup_gpu_bridge_detail">%1$s — не Adreno. Увімкнено експериментальний міст Vulkan: сеанс малює через власний драйвер телефона. Можливі помилки; надішліть журнали сеансу.</string> + <string name="setup_bridge_safe">Безпечний режим</string> + <string name="setup_bridge_safe_on">Безпечний режим: увімк.</string> + <string name="setup_bridge_safe_off">Безпечний режим: вимк.</string> + <string name="setup_bridge_safe_on_detail">Найкраща сумісність. Рекомендовано для нового пристрою.</string> + <string name="setup_bridge_safe_off_detail">Швидше там, де цей GPU пройшов перевірки.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: автоматично</string> + <string name="setup_bridge_dxvk_proton">DXVK: з Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Використовує старіший DXVK, якщо Vulkan цього GPU застарий для DXVK з Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Кожен Proton залишає свій DXVK, навіть якщо Vulkan цього GPU може бути для нього застарим.</string> <string name="apps_search_hint">Пошук застосунків</string> <string name="apps_no_match">Немає застосунків за запитом «%1$s».</string> <string name="apps_add_widget">Додати віджет</string> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a93d71508c..2c11cbbfd6 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3500,6 +3500,19 @@ <string name="integration_shortcuts_service">Nút Home DroidDeck</string> <string name="integration_shortcuts_service_description">Chuyển các lần nhấn nút Home đến Steam Guide khi phiên Steam đang được chọn và DroidDeck là ứng dụng màn hình chính mặc định. Không đọc nội dung màn hình.</string> <string name="integration_brightness_needed">Bật Độ sáng trong Thiết lập → Tích hợp Steam</string> + <string name="setup_gpu_bridge_off">Cầu Mali: tắt</string> + <string name="setup_gpu_bridge_on">Cầu Mali: bật</string> + <string name="setup_gpu_bridge_detail">%1$s không phải Adreno. Cầu Vulkan thử nghiệm đang bật: phiên vẽ qua trình điều khiển của chính điện thoại. Có thể gặp lỗi; hãy gửi nhật ký phiên.</string> + <string name="setup_bridge_safe">Chế độ an toàn</string> + <string name="setup_bridge_safe_on">Chế độ an toàn: bật</string> + <string name="setup_bridge_safe_off">Chế độ an toàn: tắt</string> + <string name="setup_bridge_safe_on_detail">Tương thích nhất. Nên dùng cho thiết bị mới.</string> + <string name="setup_bridge_safe_off_detail">Nhanh hơn ở những chỗ GPU này đã vượt qua kiểm tra.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: tự động</string> + <string name="setup_bridge_dxvk_proton">DXVK: của Proton</string> + <string name="setup_bridge_dxvk_auto_detail">Dùng DXVK cũ hơn khi Vulkan của GPU này quá cũ cho DXVK của Proton.</string> + <string name="setup_bridge_dxvk_proton_detail">Mỗi Proton giữ DXVK riêng, kể cả khi Vulkan của GPU này có thể quá cũ cho nó.</string> <string name="apps_search_hint">Tìm ứng dụng</string> <string name="apps_no_match">Không có ứng dụng nào khớp với “%1$s”.</string> <string name="apps_add_widget">Thêm tiện ích</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8808906445..15fb5b5851 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -802,6 +802,7 @@ <string name="setup_gpu_supported">设备受支持</string> <string name="setup_gpu_untested">未经测试的 GPU</string> <string name="setup_gpu_unsupported">GPU 不受支持</string> + <string name="setup_gpu_bridged">GPU 通过 Mali 桥接</string> <string name="setup_gpu_detail">%1$s · %2$s</string> <string name="setup_gpu_untested_detail">%1$s:%2$s</string> <string name="setup_gpu_unsupported_detail">Steam 需要 Adreno 驱动;%1$s 可能显示黑屏</string> @@ -2145,6 +2146,8 @@ <string name="gpuinfo_a850_experimental">Adreno 850 实验支持:需要配套的实验版显示驱动和游戏驱动;尚未在此设备上验证</string> <string name="gpuinfo_below_tested">低于已测试的硬件(Adreno 725 及更新):可能无法运行</string> <string name="gpuinfo_unsupported">不受支持:DroidDeck 需要 Adreno(骁龙)GPU</string> + <string name="gpuinfo_bridge">通过 Mali 桥接运行,使用手机自带的 Vulkan 驱动</string> + <string name="gpuinfo_bridge_off">关闭 Mali 桥接时不受支持:Turnip 需要 Adreno(骁龙)GPU</string> <string name="turnip_rate_limited">已达到 GitHub 的请求频率限制 — 请稍后重试</string> <string name="turnip_github_http">GitHub 返回 HTTP %1$d</string> @@ -3500,6 +3503,19 @@ <string name="integration_shortcuts_service">DroidDeck 主屏幕按钮</string> <string name="integration_shortcuts_service_description">当 Steam 会话处于焦点且 DroidDeck 为默认主屏幕应用时,将主屏幕按钮的按下操作传递给 Steam Guide 按钮。不会读取屏幕内容。</string> <string name="integration_brightness_needed">请在“配置”→“Steam 集成”中开启亮度</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK:自动</string> + <string name="setup_bridge_dxvk_proton">DXVK:Proton 自带</string> + <string name="setup_bridge_dxvk_auto_detail">此 GPU 的 Vulkan 版本对 Proton 自带的 DXVK 来说太旧时,改用较旧的 DXVK。</string> + <string name="setup_bridge_dxvk_proton_detail">每个 Proton 都使用自带的 DXVK,即使此 GPU 的 Vulkan 版本可能太旧。</string> + <string name="setup_gpu_bridge_off">Mali 桥接:关</string> + <string name="setup_gpu_bridge_on">Mali 桥接:开</string> + <string name="setup_gpu_bridge_detail">%1$s 不是 Adreno。实验性 Vulkan 桥接已开启:会话通过手机自带的驱动绘制。可能会有问题,请发送会话日志。</string> + <string name="setup_bridge_safe">安全模式</string> + <string name="setup_bridge_safe_on">安全模式:开</string> + <string name="setup_bridge_safe_off">安全模式:关</string> + <string name="setup_bridge_safe_on_detail">兼容性最好。推荐新设备使用。</string> + <string name="setup_bridge_safe_off_detail">在此 GPU 通过检查的地方更快。</string> <string name="apps_search_hint">搜索应用</string> <string name="apps_no_match">没有与“%1$s”匹配的应用。</string> <string name="apps_add_widget">添加微件</string> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 095cb890c3..d3af069caf 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3500,6 +3500,19 @@ <string name="integration_shortcuts_service">DroidDeck 主畫面按鈕</string> <string name="integration_shortcuts_service_description">當 Steam 會話處於焦點且 DroidDeck 為預設主畫面應用程式時,將主畫面按鈕的按壓傳送給 Steam Guide。不會讀取螢幕內容。</string> <string name="integration_brightness_needed">請在「初始設定 → Steam 整合」中開啟「亮度」</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK:自動</string> + <string name="setup_bridge_dxvk_proton">DXVK:Proton 內建</string> + <string name="setup_bridge_dxvk_auto_detail">此 GPU 的 Vulkan 版本對 Proton 內建的 DXVK 來說太舊時,改用較舊的 DXVK。</string> + <string name="setup_bridge_dxvk_proton_detail">每個 Proton 都使用內建的 DXVK,即使此 GPU 的 Vulkan 版本可能太舊。</string> + <string name="setup_gpu_bridge_off">Mali 橋接:關</string> + <string name="setup_gpu_bridge_on">Mali 橋接:開</string> + <string name="setup_gpu_bridge_detail">%1$s 不是 Adreno。實驗性 Vulkan 橋接已開啟:工作階段透過手機內建的驅動程式繪製。可能會有問題,請傳送工作階段記錄。</string> + <string name="setup_bridge_safe">安全模式</string> + <string name="setup_bridge_safe_on">安全模式:開</string> + <string name="setup_bridge_safe_off">安全模式:關</string> + <string name="setup_bridge_safe_on_detail">相容性最好。建議新裝置使用。</string> + <string name="setup_bridge_safe_off_detail">在此 GPU 通過檢查的地方較快。</string> <string name="apps_search_hint">搜尋應用程式</string> <string name="apps_no_match">沒有符合「%1$s」的應用程式。</string> <string name="apps_add_widget">新增小工具</string> @@ -3607,4 +3620,7 @@ <string name="stores_gamejolt_filter_status">狀態</string> <string name="stores_gamejolt_filter_partners">合作夥伴</string> <string name="stores_gamejolt_followed">已追蹤的遊戲</string> + <string name="setup_gpu_bridged">GPU 透過 Mali 橋接</string> + <string name="gpuinfo_bridge">透過 Mali 橋接執行,使用手機內建的 Vulkan 驅動程式</string> + <string name="gpuinfo_bridge_off">關閉 Mali 橋接時不受支援:Turnip 需要 Adreno(Snapdragon)GPU</string> </resources> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 56005e1ff8..d9ffdfae77 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3500,6 +3500,19 @@ <string name="integration_shortcuts_service">DroidDeck 主畫面按鈕</string> <string name="integration_shortcuts_service_description">當 Steam 工作階段處於焦點且 DroidDeck 為預設主畫面應用程式時,將主畫面按鈕的按壓傳送給 Steam Guide。不會讀取螢幕內容。</string> <string name="integration_brightness_needed">請在「初始設定 → Steam 整合」中開啟「亮度」</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK:自動</string> + <string name="setup_bridge_dxvk_proton">DXVK:Proton 內建</string> + <string name="setup_bridge_dxvk_auto_detail">此 GPU 的 Vulkan 版本對 Proton 內建的 DXVK 來說太舊時,改用較舊的 DXVK。</string> + <string name="setup_bridge_dxvk_proton_detail">每個 Proton 都使用內建的 DXVK,即使此 GPU 的 Vulkan 版本可能太舊。</string> + <string name="setup_gpu_bridge_off">Mali 橋接:關</string> + <string name="setup_gpu_bridge_on">Mali 橋接:開</string> + <string name="setup_gpu_bridge_detail">%1$s 不是 Adreno。實驗性 Vulkan 橋接已開啟:工作階段透過手機內建的驅動程式繪製。可能會有問題,請傳送工作階段記錄。</string> + <string name="setup_bridge_safe">安全模式</string> + <string name="setup_bridge_safe_on">安全模式:開</string> + <string name="setup_bridge_safe_off">安全模式:關</string> + <string name="setup_bridge_safe_on_detail">相容性最好。建議新裝置使用。</string> + <string name="setup_bridge_safe_off_detail">在此 GPU 通過檢查的地方較快。</string> <string name="apps_search_hint">搜尋應用程式</string> <string name="apps_no_match">沒有符合「%1$s」的應用程式。</string> <string name="apps_add_widget">新增小工具</string> @@ -3607,4 +3620,7 @@ <string name="stores_gamejolt_filter_status">狀態</string> <string name="stores_gamejolt_filter_partners">合作夥伴</string> <string name="stores_gamejolt_followed">已追蹤的遊戲</string> + <string name="setup_gpu_bridged">GPU 透過 Mali 橋接</string> + <string name="gpuinfo_bridge">透過 Mali 橋接執行,使用手機內建的 Vulkan 驅動程式</string> + <string name="gpuinfo_bridge_off">關閉 Mali 橋接時不受支援:Turnip 需要 Adreno(Snapdragon)GPU</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6f88608575..e429091d72 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -464,6 +464,12 @@ <string name="libraries_overlap">That folder is already a library or inside one</string> <string name="libraries_missing">%1$s · not available</string> <string name="libraries_applies_next">Applies from the next Steam session</string> + <string name="libraries_found_hint">Found on this device · %1$s · %2$s</string> + <string name="libraries_add_found">Add</string> + <string name="libraries_access_title">Find libraries on internal storage</string> + <string name="libraries_access_hint">Allow all files access so DroidDeck can see Steam libraries other apps keep on internal storage</string> + <string name="libraries_access_allow">Allow</string> + <string name="libraries_used_inner">Added %1$s, the Steam library inside the folder you chose</string> <string name="mode_storage_note">Games that stream assets from SD or shared storage may stutter.</string> <string name="mode_storage_diagnostics">Storage diagnostics</string> <string name="mode_storage_diagnostics_hint">Record allocation results and sampled storage timings in Share logs. May slow installs while enabled. Applies next session.</string> @@ -866,6 +872,7 @@ <string name="setup_gpu_supported">Device supported</string> <string name="setup_gpu_untested">Untested GPU</string> <string name="setup_gpu_unsupported">GPU not supported</string> + <string name="setup_gpu_bridged">GPU via Mali bridge</string> <string name="setup_gpu_detail">%1$s · %2$s</string> <string name="setup_gpu_untested_detail">%1$s: %2$s</string> <string name="setup_gpu_unsupported_detail">Steam needs an Adreno driver; %1$s may show a black screen</string> @@ -1389,6 +1396,15 @@ <string name="proton_cancel_queued">Cancel queued</string> <string name="pckb_android">Android keyboard</string> <string name="pckb_hide">Hide ✕</string> + <string name="pckb_size">Size on screen</string> + <string name="pckb_size_hint">Share of the screen the keyboard takes, header included.</string> + <string name="pckb_opacity">Opacity</string> + <string name="pckb_opacity_hint">Lower it to see the game behind the keyboard.</string> + <string name="pckb_hidden_keys">Hidden keys</string> + <string name="pckb_hidden_keys_hint">Keys you rarely use stay off the keyboard.</string> + <string name="pckb_group_function">Esc and function row</string> + <string name="pckb_group_nav">Ins / Del / Home / End / PgUp / PgDn</string> + <string name="pckb_group_arrows">Arrow keys</string> <string name="main_launch_named">Launch %1$s</string> <string name="main_choose_screen">Choose a screen. Secondary: %1$s.</string> <string name="main_secondary_gone">The secondary display is no longer available.</string> @@ -1903,6 +1919,12 @@ <string name="bottom_desktop_failed">The desktop couldn\'t start. Its logs are in this session\'s bottom-desktop folder.</string> <string name="bottom_desktop_off">The desktop is closed.</string> <string name="bottom_dashboard_empty">Nothing to show here yet.</string> + <string name="swap_screens">Swap screens</string> + <string name="swap_screens_unavailable">The bottom screen is not free right now</string> + <string name="swap_game_screen_group">Game screen</string> + <string name="swap_game_screen">Show the game on</string> + <string name="swap_game_screen_top">Top screen</string> + <string name="swap_game_screen_bottom">Bottom screen</string> <string name="bottom_page_downloads">Downloads</string> <string name="bottom_downloads_none">No downloads running.</string> <string name="bottom_downloads_steam">Steam</string> @@ -2238,6 +2260,8 @@ <string name="gpuinfo_a850_experimental">Experimental Adreno 850 support: requires compatible experimental display and game drivers; not verified on this device</string> <string name="gpuinfo_below_tested">Below tested hardware (Adreno 725 and newer): it may not run</string> <string name="gpuinfo_unsupported">Not supported: DroidDeck needs an Adreno (Snapdragon) GPU</string> + <string name="gpuinfo_bridge">Runs through the Mali bridge, on the phone\'s own Vulkan driver</string> + <string name="gpuinfo_bridge_off">Not supported with the Mali bridge off: Turnip needs an Adreno (Snapdragon) GPU</string> <string name="turnip_rate_limited">GitHub\'s rate limit was hit - try again later</string> <string name="turnip_github_http">GitHub answered HTTP %1$d</string> @@ -3643,6 +3667,19 @@ <string name="stores_xbox_cloud_settings">Cloud settings</string> <string name="xbox_cloud_gaming" translatable="false">Xbox Cloud Gaming</string> <string name="xbox_filter_game_pass" translatable="false">Game Pass</string> + <string name="setup_gpu_bridge_off">Mali bridge: off</string> + <string name="setup_gpu_bridge_on">Mali bridge: on</string> + <string name="setup_bridge_safe">Safe mode</string> + <string name="setup_bridge_safe_on">Safe mode: on</string> + <string name="setup_bridge_safe_off">Safe mode: off</string> + <string name="setup_bridge_safe_on_detail">Most compatible. Recommended for a new device.</string> + <string name="setup_bridge_safe_off_detail">Faster where this GPU passed its checks.</string> + <string name="setup_bridge_dxvk">DXVK</string> + <string name="setup_bridge_dxvk_auto">DXVK: automatic</string> + <string name="setup_bridge_dxvk_proton">DXVK: Proton\'s own</string> + <string name="setup_bridge_dxvk_auto_detail">Uses an older DXVK where this GPU\'s Vulkan is too old for Proton\'s.</string> + <string name="setup_bridge_dxvk_proton_detail">Every Proton keeps its own DXVK, even where this GPU\'s Vulkan may be too old for it.</string> + <string name="setup_gpu_bridge_detail">%1$s is not an Adreno. The experimental Vulkan bridge is on: the session draws through the phone\'s own driver. Expect bugs; send the session logs.</string> <string name="integration_title">Steam integration</string> <string name="integration_count">%1$d of %2$d on</string> <string name="integration_set_up">Set up</string> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 005841e7a1..ac0897739c 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -2,6 +2,7 @@ <resources> <style name="AppTheme" parent="@android:style/Theme.Material.NoActionBar"> <item name="android:colorBackground">#FF101418</item> + <item name="android:navigationBarColor">@android:color/black</item> </style> <style name="SessionTheme" parent="@android:style/Theme.Material.NoActionBar.Fullscreen"> <item name="android:windowBackground">@android:color/black</item> diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt index a2c5e483bb..77800dc1e4 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -259,6 +259,78 @@ class BattleNetTest { BattleNet.hostFolder(context, "Z:/root/Games/Stores/Battle.net/Hearthstone/")) } + @Test fun wowForeverIsListedBesideRetailInTheSharedWorldOfWarcraftFolder() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + val wow = File(pfx, "drive_c/Program Files (x86)/World of Warcraft").apply { mkdirs() } + File(wow, "_retail_").mkdirs() + File(wow, "_forever_").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").writeBytes(message( + field(1, message(field(1, "wow"), field(2, "wow"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))), + field(1, message(field(1, "wow_forever"), field(2, "wowf"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))), + )) + val games = BattleNet.games(context) + assertEquals(listOf("WoW", "WoWF"), games.map { it.code }) + assertEquals(listOf(wow, File(wow, "_forever_")), games.map { it.folder }) + assertEquals("World of Warcraft: Forever", games[1].name) + assertEquals(2, games.map { it.folder.canonicalPath }.distinct().size) + val shortcut = BattleNet.shortcut(context, games[1])!! + assertTrue(shortcut.launchOptions.endsWith("--exec=\"launch WoWF\"")) + } + + @Test fun anInstallWithAnUnknownUidIsListedByItsProductCode() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + File(pfx, "drive_c/Games/World of Warcraft").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").writeBytes(message( + field(1, message(field(1, "wowf_live"), field(2, "wowf"), field(3, message(field(1, "C:/Games/World of Warcraft"))))), + field(1, message(field(1, "unknown_thing"), field(2, "nothing"), field(3, message(field(1, "C:/Games/World of Warcraft"))))), + )) + val games = BattleNet.games(context) + assertEquals(listOf("WoWF"), games.map { it.code }) + assertEquals("wowf_live", games[0].installUid) + assertEquals("wow_forever", games[0].uid) + assertEquals("WoWF", BattleNet.titleForProduct("WOWF")?.code) + assertEquals("WTCG", BattleNet.titleForProduct("wtcg")?.code) + assertNull(BattleNet.titleForProduct("")) + assertEquals(listOf(Triple("wowf_live", "C:/Games/World of Warcraft", "wowf")), + BattleNet.productDbInstalls(message(field(1, message(field(1, "wowf_live"), field(2, "wowf"), field(3, message(field(1, "C:/Games/World of Warcraft")))))))!! + .map { Triple(it.uid, it.path, it.product) }) + } + + @Test fun aGameKeepsTheFolderItWasListedWithWhenAnotherVersionComesOrGoes() { + val root = File(context.filesDir, "World of Warcraft").apply { mkdirs() } + val retailDir = File(root, "_retail_").apply { mkdirs() } + val foreverDir = File(root, "_forever_").apply { mkdirs() } + val wow = BattleNet.title("wow")!! + val forever = BattleNet.title("wow_forever")!! + val classic = BattleNet.title("wow_classic")!! + assertEquals(mapOf("WoWF" to root), BattleNet.ownFolders(mapOf("WoWF" to (forever to root)), mapOf("WoWF" to null))) + assertEquals(mapOf("WoW" to root, "WoWF" to foreverDir), + BattleNet.ownFolders(linkedMapOf("WoW" to (wow to root), "WoWF" to (forever to root)), mapOf("WoW" to null, "WoWF" to null))) + assertEquals(mapOf("WoWF" to foreverDir), BattleNet.ownFolders(mapOf("WoWF" to (forever to root)), mapOf("WoWF" to foreverDir.path))) + assertEquals(mapOf("WoW" to retailDir, "WoWC" to root), + BattleNet.ownFolders(linkedMapOf("WoW" to (wow to root), "WoWC" to (classic to root)), mapOf("WoW" to null, "WoWC" to root.path))) + assertEquals(mapOf("WoW" to root, "WoWC" to root), + BattleNet.ownFolders(linkedMapOf("WoW" to (wow to root), "WoWC" to (classic to root)), mapOf("WoW" to null, "WoWC" to null))) + assertEquals(mapOf("WoWF" to root), BattleNet.ownFolders(mapOf("WoWF" to (forever to root)), mapOf("WoWF" to "/elsewhere"))) + } + + @Test fun theListedFolderIsRememberedAcrossScans() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + val wow = File(pfx, "drive_c/Program Files (x86)/World of Warcraft").apply { mkdirs() } + File(wow, "_forever_").mkdirs() + val db = File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").apply { parentFile!!.mkdirs() } + val retail = field(1, message(field(1, "wow"), field(2, "wow"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))) + val forever = field(1, message(field(1, "wow_forever"), field(2, "wowf"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))) + db.writeBytes(message(retail, forever)) + assertEquals(listOf(wow, File(wow, "_forever_")), BattleNet.games(context).map { it.folder }) + db.writeBytes(message(forever)) + assertEquals(listOf(File(wow, "_forever_")), BattleNet.games(context).map { it.folder }) + db.writeBytes(message(forever, retail)) + assertEquals(listOf(File(wow, "_forever_"), wow), BattleNet.games(context).map { it.folder }) + } + @Test fun aGamesShortcutHasBattleNetLaunchItInItsPrefix() { val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Diablo IV").apply { mkdirs() } File(folder, "Diablo IV Launcher.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) @@ -291,6 +363,7 @@ class BattleNetTest { assertEquals(codes.distinct(), codes) assertTrue("Fen" in codes && "OSI" in codes && "WTCG" in codes) assertFalse(BattleNet.STORE.any { it.uid == "d3cn" || it.uid == "fen" }) + assertFalse(BattleNet.STORE.any { it.code == "WoWC" || it.code == "WoWF" }) assertEquals("fenris", BattleNet.STORE.first { it.code == "Fen" }.uid) assertTrue(BattleNet.STORE.all { it.uid.matches(Regex("[a-z0-9_]{1,32}")) }) val installed = listOf("fenris", "diablo3_enus", null) diff --git a/app/src/test/java/com/droiddeck/launcher/session/BottomDesktopSizeTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BottomDesktopSizeTest.kt new file mode 100644 index 0000000000..bafa252400 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BottomDesktopSizeTest.kt @@ -0,0 +1,25 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Test + +class BottomDesktopSizeTest { + @Test fun theDuosBottomPanelKeepsItsPixels() { + assertEquals(1280 to 848, desktopOutputSize(1280, 848, false, 720f)) + } + + @Test fun aLargerPanelRendersBelowItsResolution() { + assertEquals(826 to 646, desktopOutputSize(1240, 970, false, 720f)) + assertEquals(1280 to 644, desktopOutputSize(1920, 968, false, 720f)) + } + + @Test fun theTopScreenAfterASwapGetsItsOwnPixelsAndTheWideShape() { + assertEquals(1920 to 968, desktopOutputSize(1920, 968, true, 720f)) + assertEquals(1920 to 968, desktopOutputSize(1920, 969, true, 720f)) + } + + @Test fun noPanelNoSize() { + assertEquals(0 to 0, desktopOutputSize(0, 848, true, 720f)) + assertEquals(0 to 0, desktopOutputSize(1280, 0, false, 720f)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/BridgeDxvkTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BridgeDxvkTest.kt new file mode 100644 index 0000000000..45afb7785c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BridgeDxvkTest.kt @@ -0,0 +1,267 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import com.droiddeck.launcher.gpu.AppVulkan +import com.droiddeck.launcher.gpu.GpuInfo +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.github.luben.zstd.ZstdOutputStream +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream +import org.json.JSONObject +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class BridgeDxvkTest { + private val old = ComponentsManager.DXVK_FOR_VULKAN_1_1 + private val mid = ComponentsManager.DXVK_FOR_VULKAN_1_3_NO_INT64 + private lateinit var context: Context + + private val g710 = AppVulkan(1, 1, shaderInt64 = false, maxPushConstants = 128, source = "driver") + private val promoted = g710.copy(minor = 2, source = "bridge") + private val full = AppVulkan(1, 3, shaderInt64 = true, maxPushConstants = 256, source = "driver") + private val mali = GpuInfo("Mali-G710", 0, GpuInfo.Family.NOT_ADRENO, "", false) + + @Before fun setUp() { + context = RuntimeEnvironment.getApplication() + File(context.filesDir, "components").deleteRecursively() + LinuxRuntime.rootDir(context).deleteRecursively() + } + + @Test fun theNewestDxvkThatStartsIsChosen() { + assertEquals(old, ComponentsManager.bridgeDxvk(g710)?.file) + assertEquals(old, ComponentsManager.bridgeDxvk(promoted)?.file) + assertEquals(mid, ComponentsManager.bridgeDxvk(full.copy(shaderInt64 = false))?.file) + assertEquals(mid, ComponentsManager.bridgeDxvk(full.copy(maxPushConstants = 128))?.file) + assertNull(ComponentsManager.bridgeDxvk(full)) + assertNull(ComponentsManager.bridgeDxvk(full.copy(shaderInt64 = null, maxPushConstants = null))) + assertNull(ComponentsManager.bridgeDxvk(AppVulkan(1, 0, null, null, "driver"))) + assertNull(ComponentsManager.bridgeDxvk(null)) + assertEquals("Dxvk-Linux", ComponentsManager.bridgeDxvk(g710)?.release) + assertEquals("dxvk", ComponentsManager.bridgeDxvk(g710)?.comp) + } + + @Test fun theDriversLinesAreRead() { + val vk = AppVulkan.fromDriver(mapOf("device" to "Mali-G710 MC10", "api" to "1.1.177", "shader_int64" to "no", "max_push_constants" to "128")) + assertEquals(g710, vk) + assertNull(AppVulkan.fromDriver(mapOf("error" to "no Vulkan device"))) + assertNull(AppVulkan.fromDriver(mapOf("api" to "garbage"))) + val older = AppVulkan.fromDriver(mapOf("api" to "1.3.250"))!! + assertNull(older.shaderInt64) + assertNull(older.maxPushConstants) + } + + @Test fun theBridgesFileWinsForItsOwnGpuOnly() { + val text = "device=Mali-G710 MC10\napi=1.2.177\ndriver_api=1.1.177\npromotion=on\nshader_int64=0\nmax_push_constants=128\n" + val on = promoted.copy(source = "bridge, promoted") + assertEquals(on, AppVulkan.fromBridgeFile(text, "Mali-G710 MC10")) + assertEquals(on, AppVulkan.fromBridgeFile(text, null)) + assertEquals(on, AppVulkan.fromBridgeFile(text, "Mali-G710 MC10", "1.1.177")) + assertNull(AppVulkan.fromBridgeFile(text, "Mali-G720 Immortalis MC12")) + assertNull(AppVulkan.fromBridgeFile("device=x\n", null)) + } + + @Test fun withoutPromotionOnTheDriversVersionCounts() { + val g710File = g710.copy(source = "bridge") + val off = "device=Mali-G710 MC10\napi=1.1.177\ndriver_api=1.1.177\npromotion=off\nshader_int64=0\nmax_push_constants=128\n" + assertEquals(g710File, AppVulkan.fromBridgeFile(off, "Mali-G710 MC10", "1.1.177")) + val old = "device=Mali-G710 MC10\napi=1.3.177\ndriver_api=1.1.177\nshader_int64=0\nmax_push_constants=128\n" + assertEquals(g710File, AppVulkan.fromBridgeFile(old, "Mali-G710 MC10")) + assertNull(AppVulkan.fromBridgeFile(off, "Mali-G710 MC10", "1.3.212")) + } + + @Test fun anAdrenoSessionIsNotTouched() { + proton("proton-exp") + assertNull(run(g710, bridge = false)) + } + + @Test fun aShippedDxvk3IsReplacedOnAVulkan11Phone() { + proton("proton-exp") + proton("ge") + val applied = mutableListOf<String>() + val result = run(g710, applyAuto = { id, file -> applied += "$id $file"; "swapped $id" }) + assertEquals(listOf("ge $old", "proton-exp $old"), applied.sorted()) + assertTrue(result!!.startsWith("Vulkan 1.1, shaderInt64 no, push constants 128 (driver): DXVK $old")) + } + + @Test fun thePlayersOwnChoiceIsKept() { + proton("proton-exp") + writeState("proton-exp", JSONObject().put("file", "dxvk-3.1-linux.wcp").put("protonVersion", "experimental-11")) + assertNull(run(g710)) + assertNull(run(full)) + } + + @Test fun anAutomaticChoiceFollowsTheDevice() { + proton("proton-exp") + writeState("proton-exp", JSONObject().put("file", mid).put("protonVersion", "experimental-11").put("auto", true)) + val applied = mutableListOf<String>() + run(g710, applyAuto = { id, file -> applied += "$id $file"; "swapped" }) + assertEquals(listOf("proton-exp $old"), applied) + + writeState("proton-exp", JSONObject().put("file", old).put("protonVersion", "experimental-11").put("auto", true)) + assertNull(run(g710)) + val undone = mutableListOf<String>() + run(full, undoAuto = { id, comp -> undone += "$id $comp"; "undone" }) + assertEquals(listOf("proton-exp dxvk"), undone) + } + + @Test fun theSwapAndItsUndoReachTheProton() { + proton("proton-exp") + val d3d11 = File(protonDir("proton-exp"), "files/lib/wine/dxvk/aarch64-windows/d3d11.dll") + writePackage(old, "DXVK 1.10.3") + val auto: (String, String) -> String = { id, file -> ComponentsManager.swap(context, id, file, auto = true) } + val undo: (String, String) -> String = { id, comp -> ComponentsManager.undoAutoChoice(context, id, comp) } + + assertNotNull(run(g710, applyAuto = auto, undoAuto = undo)) + assertEquals("DXVK 1.10.3", d3d11.readText()) + val entry = state().getJSONObject("active").getJSONObject("proton-exp").getJSONObject("dxvk") + assertEquals(old, entry.getString("file")) + assertTrue(entry.getBoolean("auto")) + assertNull(run(g710, applyAuto = auto, undoAuto = undo)) + + run(full, applyAuto = auto, undoAuto = undo) + assertEquals("bundled DXVK experimental-11", d3d11.readText()) + assertNull(state().getJSONObject("active").optJSONObject("proton-exp")?.optJSONObject("dxvk")) + } + + @Test fun aFailedDetectionKeepsTheLastAutomaticChoice() { + proton("proton-exp") + writeState("proton-exp", JSONObject().put("file", old).put("protonVersion", "experimental-11").put("auto", true)) + assertNull(run(null)) + assertEquals(old, state().getJSONObject("active").getJSONObject("proton-exp").getJSONObject("dxvk").getString("file")) + } + + @Test fun oneProtonFailingDoesNotStopTheOthers() { + proton("ge") + proton("proton-exp") + val applied = mutableListOf<String>() + val result = run(g710, applyAuto = { id, file -> if (id == "ge") error("disk full"); applied += "$id $file"; "swapped $id" }) + assertEquals(listOf("proton-exp $old"), applied) + assertTrue(result!!, result.contains("disk full") && result.contains("swapped proton-exp")) + } + + @Test fun aChoiceWhoseSavedCopyIsGoneIsKept() { + proton("proton-exp") + writeState("proton-exp", JSONObject().put("file", old).put("label", "DXVK 1.10.3").put("protonVersion", "experimental-11").put("auto", true)) + val result = run(full, undoAuto = { id, comp -> ComponentsManager.undoAutoChoice(context, id, comp) }) + assertTrue(result!!, result.contains("its own copy is gone")) + assertEquals(old, state().getJSONObject("active").getJSONObject("proton-exp").getJSONObject("dxvk").getString("file")) + } + + @Test fun aProtonUpdateWithNoRuleLeftJustForgetsTheChoice() { + proton("proton-exp", "experimental-12") + writeState("proton-exp", JSONObject().put("file", old).put("protonVersion", "experimental-11").put("auto", true)) + run(full, undoAuto = { id, comp -> ComponentsManager.undoAutoChoice(context, id, comp) }) + assertNull(state().getJSONObject("active").optJSONObject("proton-exp")?.optJSONObject("dxvk")) + assertEquals("bundled DXVK experimental-12", File(protonDir("proton-exp"), "files/lib/wine/dxvk/aarch64-windows/d3d11.dll").readText()) + } + + @Test fun thePlayerCanKeepProtonsOwnDxvk() { + proton("proton-exp") + assertNull("nothing chosen when declined", run(g710, keep = true)) + writeState("proton-exp", JSONObject().put("file", old).put("protonVersion", "experimental-11").put("auto", true)) + val undone = mutableListOf<String>() + run(g710, keep = true, undoAuto = { id, comp -> undone += "$id $comp"; "undone" }) + assertEquals("an earlier automatic choice goes back", listOf("proton-exp dxvk"), undone) + } + + @Test fun turningTheBridgeOffRestoresProtonsOwn() { + proton("proton-exp") + val d3d11 = File(protonDir("proton-exp"), "files/lib/wine/dxvk/aarch64-windows/d3d11.dll") + writePackage(old, "DXVK 1.10.3") + val auto: (String, String) -> String = { id, file -> ComponentsManager.swap(context, id, file, auto = true) } + val undo: (String, String) -> String = { id, comp -> ComponentsManager.undoAutoChoice(context, id, comp) } + run(g710, applyAuto = auto, undoAuto = undo) + assertEquals("DXVK 1.10.3", d3d11.readText()) + run(null, bridge = false, applyAuto = auto, undoAuto = undo) + assertEquals("bundled DXVK experimental-11", d3d11.readText()) + assertNull(state().getJSONObject("active").optJSONObject("proton-exp")?.optJSONObject("dxvk")) + } + + @Test fun turningTheBridgeOffKeepsThePlayersOwnChoice() { + proton("proton-exp") + writeState("proton-exp", JSONObject().put("file", "dxvk-3.1-linux.wcp").put("protonVersion", "experimental-11")) + assertNull(run(g710, bridge = false)) + assertNull(run(g710, keep = true)) + } + + @Test fun aQueuedAutomaticSwapIsDroppedWhenTheBridgeIsOff() { + proton("proton-exp") + val f = File(context.filesDir, "components/state.json") + f.parentFile!!.mkdirs() + f.writeText(JSONObject().put("active", JSONObject()) + .put("queued", JSONObject().put("proton-exp", JSONObject() + .put("dxvk", JSONObject().put("kind", "package").put("file", old).put("auto", true)) + .put("vkd3d", JSONObject().put("kind", "package").put("file", "vkd3d-x.wcp")))).toString()) + assertNull(run(null, bridge = false)) + val q = state().getJSONObject("queued").getJSONObject("proton-exp") + assertFalse(q.has("dxvk")) + assertTrue("the player's own queued swap stays", q.has("vkd3d")) + } + + @Test fun whenAutomaticChoicesAreUndone() { + val rule = ComponentsManager.bridgeDxvk(g710) + assertTrue(ComponentsManager.autoDxvkUndoWanted(false, false, null, null)) + assertTrue(ComponentsManager.autoDxvkUndoWanted(true, true, g710, null)) + assertTrue(ComponentsManager.autoDxvkUndoWanted(true, false, full, null)) + assertFalse("failed detection keeps it", ComponentsManager.autoDxvkUndoWanted(true, false, null, null)) + assertFalse(ComponentsManager.autoDxvkUndoWanted(true, false, g710, rule)) + } + + private fun run( + vk: AppVulkan?, + bridge: Boolean = true, + keep: Boolean = false, + applyAuto: (String, String) -> String = { id, file -> error("apply $id $file") }, + undoAuto: (String, String) -> String = { id, comp -> error("undo $id $comp") }, + ) = ComponentsManager.ensureForcedPackages( + context, mali, + lookup = { file, release -> ComponentsManager.CatalogItem(file, "dxvk", release, "https://example.invalid/$file", 4, "sha256:" + "ab".repeat(32)) }, + fetch = {}, + apply = { id, file -> error("non-automatic apply $id $file") }, + vulkan = vk, bridgeSession = bridge, applyAuto = applyAuto, undoAuto = undoAuto, keepProtonDxvk = keep, + ) + + private fun protonDir(name: String) = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps/common/$name") + + private fun proton(name: String, version: String = "experimental-11") { + val dir = protonDir(name) + File(dir, "files/lib/wine").mkdirs() + File(dir, "proton").writeText("#!/bin/sh\n") + File(dir, "version").writeText("1 $version\n") + File(dir, "files/lib/wine/dxvk/aarch64-windows/d3d11.dll").apply { + parentFile!!.mkdirs() + writeText("bundled DXVK $version") + } + } + + private fun state() = JSONObject(File(context.filesDir, "components/state.json").readText()) + + private fun writeState(protonId: String, dxvk: JSONObject) { + val f = File(context.filesDir, "components/state.json") + f.parentFile!!.mkdirs() + f.writeText(JSONObject().put("active", JSONObject().put(protonId, JSONObject().put("dxvk", dxvk))) + .put("queued", JSONObject()).toString()) + } + + private fun writePackage(file: String, d3d11: String) { + val dest = File(context.filesDir, "components/packages/$file") + dest.parentFile!!.mkdirs() + TarArchiveOutputStream(ZstdOutputStream(dest.outputStream())).use { tar -> + fun put(name: String, bytes: ByteArray) { + tar.putArchiveEntry(TarArchiveEntry(name).apply { size = bytes.size.toLong() }) + tar.write(bytes) + tar.closeArchiveEntry() + } + put("./profile.json", JSONObject().put("type", "DXVK-Linux").put("versionName", file.removeSuffix(".wcp")).toString().toByteArray()) + put("./files/lib/wine/dxvk/aarch64-windows/d3d11.dll", d3d11.toByteArray()) + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt index 183618ab85..1fa5a5aaf7 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt @@ -65,6 +65,30 @@ class SteamLibrariesTest { assertTrue(SteamLibraries.add(app, nested.path) is SteamLibraries.AddResult.Refused) } + private fun library(dir: File): File = dir.apply { File(this, "steamapps").mkdirs(); File(this, "steamapps/appmanifest_220.acf").writeText("x") } + + @Test fun pickingTheFolderAboveALibraryAddsTheLibraryInside() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + val app2 = tmp.newFolder("OtherApp") + library(File(app2, "Steam")) + val entry = (SteamLibraries.add(app, app2.path) as SteamLibraries.AddResult.Added).entry + assertEquals(File(app2, "Steam").path, entry.path) + assertEquals("OtherApp", entry.label) + val empty = tmp.newFolder("Empty") + assertEquals(empty.path, (SteamLibraries.add(app, empty.path) as SteamLibraries.AddResult.Added).entry.path) + } + + @Test fun scanLooksTwoLevelsDownAndSkipsHiddenAndAppFolders() { + val volume = tmp.newFolder("volume") + val shallow = library(File(volume, "SteamLibrary")) + val deep = library(File(volume, "Some App/Steam")) + library(File(volume, "Android/data/x")) + library(File(volume, ".hidden/Steam")) + library(File(volume, "a/b/c")) + val withGames = SteamLibraries.candidates(volume, 2).filter { SteamLibraries.gameCount(it) > 0 } + assertEquals(setOf(shallow, deep), withGames.toSet()) + } + @Test fun unreadableOrInvalidEntriesAreDropped() { assertTrue(SteamLibraries.parse("{oops").isEmpty()) assertEquals(listOf("2"), SteamLibraries.parse("""[{"id":"../x","path":"/a"},{"id":"2","path":"/b","label":""}]""").map { it.id }) diff --git a/app/src/test/java/com/droiddeck/launcher/ui/AppThemeTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/AppThemeTest.kt new file mode 100644 index 0000000000..172b9dc197 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/AppThemeTest.kt @@ -0,0 +1,25 @@ +package com.droiddeck.launcher.ui + +import android.graphics.Color +import android.view.ContextThemeWrapper +import com.droiddeck.launcher.R +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34]) +class AppThemeTest { + @Test fun theNavigationBarIsOpaqueAndDarkSoNothingLightShowsThroughIt() { + val themed = ContextThemeWrapper(RuntimeEnvironment.getApplication(), R.style.AppTheme) + val attrs = themed.obtainStyledAttributes(intArrayOf(android.R.attr.navigationBarColor)) + val color = attrs.getColor(0, Color.TRANSPARENT) + attrs.recycle() + assertEquals(0xFF, Color.alpha(color)) + assertTrue(Color.luminance(color) < 0.1f) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomDesktopFitTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomDesktopFitTest.kt new file mode 100644 index 0000000000..42922163a8 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomDesktopFitTest.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Test + +class BottomDesktopFitTest { + @Test fun aDesktopOfThePanelsShapeFillsThePanel() { + assertEquals(1280 to 870, fitDesktop(1280, 870, 1280, 870)) + assertEquals(1280 to 870, fitDesktop(1280, 870, 1278, 868)) + } + + @Test fun aDesktopOfAnotherShapeIsFittedNotStretched() { + val (w, h) = fitDesktop(1920, 1016, 1280, 870) + assertEquals(1016, h) + assertEquals(1494, w) + } + + @Test fun nothingToFitLeavesThePanelSize() { + assertEquals(1920 to 1016, fitDesktop(1920, 1016, 0, 0)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GameScreenSwapTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GameScreenSwapTest.kt new file mode 100644 index 0000000000..04ff32d59c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/GameScreenSwapTest.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class GameScreenSwapTest { + private fun wanted( + requested: Boolean = true, + activityStarted: Boolean = true, + sessionEnded: Boolean = false, + inPip: Boolean = false, + glassesOutput: Boolean = false, + bottomScreenFree: Boolean = true, + ) = GameScreenSwap.wanted(requested, activityStarted, sessionEnded, inPip, glassesOutput, bottomScreenFree) + + @Test fun thePickedSwapPutsTheGameOnTheBottomScreen() { + assertTrue(wanted()) + } + + @Test fun withoutAPickTheGameStaysOnTop() { + assertFalse(wanted(requested = false)) + } + + @Test fun theGameComesBackToTheTopWhenTheSessionIsHiddenOrEnds() { + assertFalse(wanted(activityStarted = false)) + assertFalse(wanted(sessionEnded = true)) + assertFalse(wanted(inPip = true)) + } + + @Test fun glassesAndAHeldBottomScreenWin() { + assertFalse(wanted(glassesOutput = true)) + assertFalse(wanted(bottomScreenFree = false)) + } +} diff --git a/docs/development/stores.md b/docs/development/stores.md index 1209b7c478..e2995c863b 100644 --- a/docs/development/stores.md +++ b/docs/development/stores.md @@ -233,6 +233,17 @@ picker. Its launcher sets five FuelPump variables frozen at install time: `FUEL_ `AMAZON_GAMES_FUEL_DISPLAY_NAME` (the account name, `Player` without one). No Amazon Games SDK files are deployed into the prefix and `fuel.json` `PostInstall` steps are not run. +GOG's registry data reaches the prefix before Proton starts: a `goggame-<id>.script` install action +with `setRegistry` becomes a `.reg` import through the game's own Proton (`reg.exe import /reg:32`), +once per script revision - `.droiddeck-gog-registry` in the prefix holds the import's hash - and a +failed import is retried on the next launch. GOG completes some installs by running a support +installer from the game folder (the script's `Execute` action); under ARM64 FEX that 32-bit +self-extractor stops at "Path not found", so the values it installs are applied from +`GOG_INSTALL_REGISTRY` in `droiddeck-store-launch` instead: The Witcher: Enhanced Edition's +`HKLM\Software\CD Projekt Red\The Witcher` block and its text/voice languages (#694), without which +`witcher.exe` exits during startup. The language comes from the installed product's +`goggame-<id>.info`, and a script's own `setRegistry` entries always win over the built-in table. + A game's web links reach Android: `droiddeck-store-launch` sets the prefix's `HKCU\Software\Wine\WineBrowser` `Browsers` to `/usr/local/bin/droiddeck-open-url`, which is also `xdg-open` first on the game's PATH, and hands http(s) addresses to the app, which opens them in diff --git a/docs/images/droiddeck-hud-v25-terraria.png b/docs/images/droiddeck-hud-v25-terraria.png new file mode 100644 index 0000000000..2739bf5902 Binary files /dev/null and b/docs/images/droiddeck-hud-v25-terraria.png differ diff --git a/docs/openmali/README.md b/docs/openmali/README.md new file mode 100644 index 0000000000..0760cf2ec9 --- /dev/null +++ b/docs/openmali/README.md @@ -0,0 +1,244 @@ +# openMali 工作区记录 + +> 本文件记录 2026-10-31 ~ 2026-11-01 在本机与小米平板上的 MaliBridge + DroidDeck 0.6.7 合并、构建、调试和性能测试结果。 +> 这是本地工程记录,不是上游发布文档。未特别说明的 APK 均为 testkey 签名。 + +## 1. 目标与结论 + +- 目标:把 MaliBridge v0.5.4.2 的 Mali GPU 支持合并进 DroidDeck 0.6.7 主线,构建可安装 APK,并在平板上进入桌面、跑通 Steam 和性能测试。 +- 已做到: + - 0.6.7 + MaliBridge v0.5.4.2 的合并包可安装。 + - Ubuntu rc4 运行时 + 内置最新 proot + KWin Zink/Mali 桥接,成功进入 KDE 桌面。 + - Steam 客户端下载/更新 100% 完成,进入 Steam 大屏幕登录页(二维码/账号密码)。 + - 完成 CPU、GPU、IO、内存、温度基线测试。 +- 关键结论:Mali 桥接本身没有成为瓶颈;真正的问题集中在 **运行时 DNS、proot 与 KWin 渲染栈**。当前 rc4 + packaged proot + render-node 是已验证可用的组合。 + +## 2. 设备与环境 + +- 设备:Xiaomi M367FC,SoC xring_o3_asic,GPU Mali-G2-Ultra-NX MC16,Android 17,内核 6.18.21。 +- CPU:10 核;内存 15.7 GB;存储 229 GB;屏幕 3408x2272;120 Hz。 +- Mali 驱动:ARM proprietary,Vulkan 1.4.345;桥接暴露 1.4.341。 +- 新 App:com.droiddeck.launcher,DroidDeck 0.6.7,versionCode 25(0.6.7-dnsfix-v25),testkey。 +- 旧 App:com.droiddeck.launcher.mali,DroidDeck-MaliBridge v0.5.4.2,versionCode 5042;保留用于对比,桌面可用。 + +## 3. 关键路径 + +- 新工程:/home/g/openMali/DroidDeck +- MaliBridge 子模块:/home/g/openMali/DroidDeck/external/MaliBridge,v0.5.4.2,提交 95a1e60 +- 合并基线:main 69ffc096,tag mali-0.6.7-v0.5.4.2 +- 旧版源码:/home/g/openMali/reference/mali0542-src +- 旧版 APK:/home/g/openMali/reference/DroidDeck-MaliBridge-v0.5.4.2.apk +- 最终 APK:/home/g/openMali/output/DroidDeck-0.6.7-Mali-rc4.apk +- 基准/参考工具:/home/g/openMali/reference/vkbridge-bench,/home/g/openMali/reference/oldapk + +## 4. 已验证的修改 + +### 4.1 运行时与 proot + +- 运行时 catalog 从 Debian linuxfs.json(r9) 切到 Ubuntu: + - app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java + - CATALOG_URL = .../linuxfs-ubuntu.json +- 实际安装:ubuntu-r1-rc4;运行时约 3 GB;桌面栈另下载约 898 MB。 +- APK 不再排除 proot,改为内置最新官方 pack: + - pack-proot-172bb48b00150b42 + - 压缩包 SHA-256:172bb48b00150b4292ba171089abecdf7243c06edddd68bf42dddb8c5bb24e4e + - app/src/main/jniLibs/arm64-v8a/libproot.so(246,512 B) + - app/src/main/jniLibs/arm64-v8a/libproot-loader.so(18,136 B) + - app/build.gradle 移除 libproot.so / libproot-loader.so 的 excludes +- LinuxRuntime: + - 优先使用 nativeLibraryDir 中的 packaged proot/loader。 + - 新增 PROOT_PACKAGED 来源;isInstalled 接受 packaged proot。 + - prootSource 显示 packaged;ProotFastPath 只允许 PROOT_PACK,因此当前 fast path 关闭。 +- 旧 r9 + 旧 session/helper/host 的 0.6.7 组合已尝试但放弃: + - KWin 曾能打开 3408x2272 窗口,但新 host 不显示、会话不稳定。 + - 该路线不作为最终方案。 + +### 4.2 proot fast path 实验 + +- 临时允许 packaged proot 走 fast path,实测反而更慢: + - fast path off(当前):sha256 256 MB 207 ms,gzip -1 405 ms,read 3.9 GB/s。 + - fast path on:sha256 259 ms,gzip 461 ms,read 3.8 GB/s。 +- 结论:该 pack 的 fast path 对 CPU/IO 是负优化,已恢复默认关闭;源码 ProotFastPath 也恢复为只允许 PROOT_PACK。 + +### 4.3 桌面 / KWin / Mali 桥接 + +- tools/linuxfs/desktop/droiddeck-desktop 的 KWin OpenGL 分支: + - 设置 KWIN_COMPOSE=O2、MESA_LOADER_DRIVER_OVERRIDE=zink、GALLIUM_DRIVER=zink、LIBGL_KOPPER_DRI2=true。 + - KWIN_RENDER_NODES 自动选择 /dev/dri/renderD0、/dev/dri/renderD307 或任意 /dev/dri/renderD*。 + - 在平板上实际使用 /dev/dri/renderD307(由 /dev/mali0 绑定)。 +- /usr/share/droiddeck/kwin-compositor 为 opengl。 +- 效果: + - DroidDeckWayland 日志出现 [window] opened KDE Wayland Compositor 1280x720。 + - host 统计出现 GPU frames,不再出现 kwin software fallback / black picture。 + - KDE 桌面、任务栏、应用菜单正常。 +- 分辨率: + - displayResolution.lxqt 设为 720p(1280x720)。 + - 720p 与 900p 的 vkgears 都是约 119.8 FPS,说明 GPU 已到 120 Hz 上限;720p 只减少缩放/带宽。 +- Steam 大屏幕模式: + - app 的“游玩 Steam”使用 gamescope/Big Picture。 + - DroidDeckWayland 日志:Steam 大屏幕模式 1280x720,86.4 fps,875 GPU frames。 + - 可用 Steam 登录页。 + +### 4.4 UI / 桥接文案 + +- GpuInfo 恢复 bridge-aware supportText(bridge),新增 gpuinfo_bridge / gpuinfo_bridge_off 字符串。 +- DeviceInfo / DeviceReport / DriverMenus 使用当前 Mali 桥接状态显示支持文案。 +- LinuxRuntime 恢复 bridgeStandIn 的 DRM render node 回退逻辑。 +- 注意:Setup 顶部仍可能显示“GPU 不受支持”的旧标签(GpuDriversState 的 unsupported 标志),但下方已显示“实验性 Vulkan 桥接已开启”,桥接实际工作正常。 + +## 5. DNS 与 Steam + +### 5.1 根因 + +- guest /etc/resolv.conf 被写成: + - 1.1.1.1 + - 8.8.8.8 + - 2001:4860:4860::8888 +- 当前网络下这些公共 DNS 解析超时: + - curl: (28) Resolving timed out after 10001 milliseconds +- 设备实际 WiFi DNS 是 192.168.1.1;guest 改用该 DNS 后: + - getent 能解析 client-update.steamstatic.com。 + - curl -I https://client-update.steamstatic.com/steam_client_linuxarm64 返回 200。 +- 结论:Steam 下载失败是 DNS,不是 Steam/GPU/代理。 + +### 5.2 已修复:App 自动获取本地 DNS + +- 修改 app/src/main/java/com/droiddeck/launcher/runtime/LinuxNetworkLinkComponent.kt: + - 新增 localDnsServers(),用 ConnectivityManager.allNetworks 遍历 WiFi/Ethernet 网络(排除 VPN)。 + - 收集这些网络的 DNS,并把默认路由 gateway 作为本地 DNS 兜底。 + - 私有地址(192.168/10.x)和 IPv4 优先。 + - writeResolver 的顺序:当前 active network DNS + localDnsServers() + 公共 DNS 兜底。 +- 验证(2026-11-01,dnsfix APK): + - logcat:LinuxNetworkLink: resolver: 192.168.1.1 8.8.8.8 1.1.1.1 2001:4860:4860::8888 + - guest /etc/resolv.conf 第一行是 nameserver 192.168.1.1。 + - getent hosts store.steampowered.com 正常;curl -I https://store.steampowered.com 返回 200。 + - 旧 guest DNS 守护 /root/.config/plasma-workspace/env/01-dns-guard.sh 已删除;没有守护进程仍正常。 +- 说明:localDnsServers() 只取 WiFi/Ethernet 的 DNS,网关排在各 DNS 之后;active network 是 VPN 时不追加本地 DNS,只用 VPN 自己的 DNS。 + +### 5.3 Steam 客户端修复 + +- Steam 主程序下载后权限为 666: + - /root/.local/share/Steam/steamrtarm64/steam + - 需 chmod +x;更新后变为 700 也可执行。 +- 需要数据目录软链接: + - /root/.steam/steam -> /root/.local/share/Steam + - /root/.steam/root -> /root/.local/share/Steam +- stale pid: + - /root/.steam/steam.pid 可能残留已死 PID,导致 “Steam is already running”;启动前删除。 +- 不要在 Konsole 里用桌面 UI 方式启动 steam: + - 会走 Xwayland/CEF,遇到 XRRGetOutputInfo() is not available / 无窗口。 + - 应从 DroidDeck 的“游玩 Steam”启动 Big Picture/gamescope。 +- 已验证(2026-11-01): + - Steam 客户端更新 575,927 KB 到 100%。 + - Big Picture 已登录,库中显示 Shadow of the Tomb Raider 等游戏。 + - 32 位 steamrtarm32/steam-runtime-launcher-service 缺失的日志仍会出现,但 Big Picture 可用;游戏启动尚未验证。 + +## 6. 性能测试 + +### 6.1 存储 IO + +| 路径 | 写 | 读 | +|---|---:|---:| +| Android /data/local/tmp | 1.0 GB/s | 4.7 GB/s | +| Android /sdcard | 0.94 GB/s | 4.3 GB/s | +| Guest proot(fast path off) | 1.2 GB/s | 3.9 GB/s | + +Guest 读取比 host 低约 17%,是 proot 路径开销;写入不慢。 + +### 6.2 CPU + +| 项目 | Host | Guest | +|---|---:|---:| +| sha256 256 MB 单线程 | 267 ms | 207 ms | +| sha256 4x256 MB 4 线程 | 256 ms(约 4 GB/s 聚合) | 216 ms(约 4.7 GB/s 聚合) | +| gzip -1 256 MB | 307 ms | 405 ms(+32%) | + +注意:host/guest 的 sha256 实现不同,不能直接比较;gzip 更接近,proot 下约慢 30%。 + +### 6.3 GPU + +- vkgears:119.86 FPS(600 帧/5 秒),720p 与 900p 基本一致,已到 120 Hz 上限。 +- 早期桥接基准:128 MiB copy 20.5 GB/s;空 submit 约 70 µs;4 KiB copy+submit 约 285 µs。 +- Steam Big Picture:1280x720,约 86.4 fps,875 GPU frames。 +- vkcube 在纹理路径触发断言(demo_prepare_texture_image),属于桥接兼容性问题,不是性能问题。 + +### 6.4 温度 / 内存 + +- CPU 29–33 °C,GPU 31–46.5 °C,Thermal Status 0,无节流。 +- 电池约 28 °C,64%。 +- 内存:15.7 GB 总,约 8.3 GB 已用,7.1 GB 可用,swap 约 2.6 GB。 +- 没有内存告急,但 swap 偏高;游戏前可重启/关闭后台。 + +### 6.5 v25 复测(2026-11-01 18:32) + +环境:DroidDeck v25;GPU/IO 在 lxqt 桌面 1920x1080@120 测,CPU 分别测桌面和 Steam 会话;游戏 FPS 取自 Terraria 世界内 HUD。Thermal Status 0,CPU 32.8 °C,GPU max 34.8–46.5 °C,电池 31.8 °C / 92%。 + +| 项目 | v25 实测 | 说明 | +|---|---:|---| +| sha256 256 MB 单线程 | 桌面 283–322 ms;Steam 219–241 ms | Steam 会话约 230 ms,接近此前 207 ms | +| gzip -1 256 MB | 桌面 514–534 ms;Steam 355–357 ms | Steam 会话约 356 ms;此前约 405 ms | +| sha256 4×256 MB | Steam 222–269 ms;桌面 262–275 ms | 4 线程 | +| Host /data/local/tmp O_DIRECT | 写 1060 / 读 1450 MB/s | 绕过 page cache | +| Guest /root ext4 | 写 876 / 读 2337 MB/s | fdatasync;O_DIRECT 写 1270 MB/s | +| Guest /root/Storage | 写 920 / 读 3029 MB/s | 读受 page cache 影响 | +| vkgears 1280x720 | 115.8 FPS,p50 111.1,p99 25 ms | 4 秒采样 | +| vkgears 1920x1080 | 113.2 FPS,p99 31 ms | 2 秒采样 | +| Terraria 1280x720@120 | 59.9 FPS,AVG 49.3,1% 22.7 | HUD;CPU 36% / 2668 MHz / 33 °C,GPU 1% | +| 内存 | 总 15.7 GB,可用 8.7 GB | Guest 已用 6.7 GB,swap 2.2 GB | + +结论:GPU 与之前 119.86 FPS 基本一致(低约 3–4%),Terraria 稳定 60 FPS;IO 正常;测试期间无热节流。CPU 在 Steam 会话约 230 ms / 356 ms,接近或优于此前 207 ms / 405 ms;桌面会话因升频状态较低,v25 无 CPU 回归。 + +## 7. 构建与安装 + +- 构建: + - cd /home/g/openMali/DroidDeck + - ./gradlew :app:assembleRelease -PndkVersion=27.3.13750724 +- 修改 runtime inputs 后先记录: + - python3 tools/release/runtime_inputs.py record +- APK(DNS 自动修复 + GPU 状态文案 + HUD/CPU 温度 + mscoree 兜底,当前安装): + - /home/g/openMali/output/DroidDeck-0.6.7-Mali-rc4-dnsfix-v25.apk + - 76 MB;versionCode 25;versionName 0.6.7-dnsfix-v25 + - SHA-256 9808a8ab17f2d9a39e0b3abc9a05c2ee1c07ec7f4ac7cfa77866b2229fb6eb82 + - 上一版保留:v24(SHA-256 56b0ab03c0120c2a7a6ad0e4ed8d30a748021d7fe9e99a13b60f62a41e13b5e0)、v23(SHA-256 b0fadc5c...)、v22(SHA-256 69cd4f5f...)、v21(SHA-256 508294a6...)、v20(SHA-256 afd1ce12...)、v19(SHA-256 f63f4eae...)、v18(SHA-256 cc469703...)、v16 DroidDeck-0.6.7-Mali-rc4-dnsfix.apk(SHA-256 6c5f8c1f...)和 DroidDeck-0.6.7-Mali-rc4.apk(无 App 内 DNS 修复,SHA-256 c58fcc58...)。 + - testkey 签名;官方 release 私钥不在本机。 +- MIUI 安装: + - 对已安装的旧包,adb push + adb shell pm install -r 可更新。 + - 对全新安装,MIUI 会报 INSTALL_FAILED_USER_RESTRICTED;需用文件管理器打开 APK,走 PackageInstaller,并在“是否允许 Shell 安装应用”点允许。 + - 官方 0.6.9 是 release key,testkey 包不能就地升级/降级;必须完整卸载,App 数据会被清空。 + +## 8. 当前安装状态 + +- com.droiddeck.launcher:0.6.7-dnsfix-v25(versionCode 25,testkey),2026-11-01 18:25 就地更新安装,App 数据保留。 +- GPU 状态:Setup 概览显示“GPU 通过 Mali 桥接”,绿色通过;不再显示“GPU 不受支持”。实现为 FrontEndSetup 的 gpuOk 包含 s.vkBridge,并新增 setup_gpu_bridged 文案。 +- 修复“清数据重启后 GPU 菜单消失”:showChecks 默认值从 false 改为 s.vkBridge;桥接开启时详情默认展开,GPU 行直接可见。已在 pm clear 后重新启动验证。 +- HUD:XRing/Mali 的 GPU load/clock/temp/thermal sysfs 对普通 App 拒绝访问,日志为 thermal zones 0、gpu load none、kgsl gpubusy refused。v21 在无数据时隐藏 GPU 统计行、VRAM=0 时隐藏 VRAM,只保留 GPU 型号;真正 GPU% / 温度 / 共享显存需要 root 或厂商遥测。 +- HUD 分辨率/卡死:v22 的 RES 不再用 Android displayMetrics 兜底,改用会话逻辑分辨率;桌面模式隐藏游戏 HUD,Steam/游戏模式显示。实测 Steam 下 HUD 为 RES 1280x720 @ 120Hz、FPS 42.8 / AVG 53.0。 +- CPU 温度/频率:v23 增加 USB/adb 辅助的 CPU 温度输入(/sdcard/DroidDeck/cpu-temp,由开发者在主机侧每 2 秒写入 cpu_therm,仓库不附带该脚本);v24 把 HUD 的 CPU 行顺序改为“占用 → 频率 → 温度”,Full/Mega/Tiles 三种布局都生效。 +- 安装方式:官方 0.6.9(release key)与 testkey 不兼容,完整卸载 0.6.9 后通过 PackageInstaller 安装;App 数据已被清空,当前是全新状态(首次启动显示配置页)。 +- DNS 自动修复已在 APK 内;运行时 ubuntu-r1-rc4、Mali 桥接、proot、桌面需要重新下载/配置;此前 Steam Big Picture 和 1280x720 KWin 已验证,但当前新数据需重新登录。 +- com.droiddeck.launcher.mali:旧 0.5.4.2 仍安装,桌面可用,用于对比。 +- 注意:Steam chmod/软链接/pid 清理仍是 guest 运行时修改;清除 App 数据或重装运行时会丢失。 +- Terraria 1.4.5.8 启动修复(2026-11-01):`dotnet40` 组件把 `WINEDLLOVERRIDES` 设为 `mscoree=n`,但该组件没有原生 `mscoree.dll`,Wine 报 `mscoree.dll not found` 后直接退出。v25 的 `droiddeck-wincomponents` 对 `mscoree=n` 自动追加 builtin 回退(`mscoree=n,b`);`dotnet40` 仍启用时,Terraria 已稳定进入世界并显示 HUD。 + +## 9. 已知问题 / 下一步 + +1. DNS 自动修复已完成(见 5.2);仍需在不同 WiFi/无 WiFi 环境下回归,确认 localDnsServers 的回退行为。 +2. Steam 桌面 UI 在 Xwayland 下仍可能无窗口;继续使用“游玩 Steam”/Big Picture,不要用 Konsole 直接 steam。 +3. Steam 32 位组件 steamrtarm32 / steam-runtime-launcher-service 缺失;Big Picture 可用。Terraria 1.4.5.8 已进入世界,其他游戏仍待验证。 +4. vkcube 纹理断言是桥接兼容性 bug,可单独排查。 +5. 真实游戏帧率/Proton/DXVK 尚未测试;当前性能数据主要是桌面、vkgears、IO/CPU。 +6. 仍是 testkey;如需官方升级安装,需要官方 release keystore。 +7. 官方 0.6.9 与 testkey 不兼容:只能完整卸载后安装,App 数据会丢;官方 APK 备份在 /tmp/installed-069.apk(宿主)和 /sdcard/Download/DroidDeck-0.6.9.apk(平板),回滚同样要先卸载。 +8. HUD 的 Mali GPU load/temp/VRAM 受驱动 sysfs 权限限制;除非 root/厂商接口,普通 App 无法获取。v21 已移除误导性的 GPU - 和 VRAM 0.0,保留 GPU 型号。 + +## 10. 已放弃 / 不再使用 + +- r9 + 旧 session/helper/host 组合:KWin 窗口不稳定/黑屏,放弃。 +- proot fast path:实测负优化,关闭。 +- 代理强制给 Steam:本地 DNS 直连更稳定;Steam 更新器对 proxy 环境并不可靠。 + +## 截图 + +Terraria 1.4.5.8 在 DroidDeck v25 + Mali 桥接 + Wine Mono 下进入世界。HUD 的 CPU 行是“占用 → 频率 → 温度”: + +![DroidDeck v25 HUD / Terraria](../images/droiddeck-hud-v25-terraria.png) diff --git a/docs/third-party/malibridge/NOTICE b/docs/third-party/malibridge/NOTICE new file mode 100644 index 0000000000..6f8ab48c28 --- /dev/null +++ b/docs/third-party/malibridge/NOTICE @@ -0,0 +1,21 @@ +MaliBridge +Copyright (C) 2026 ASEbrahim and MaliBridge contributors +https://github.com/ASEbrahim/MaliBridge + +MaliBridge is free software: you can redistribute it and/or modify it under the terms of the GNU +General Public License as published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. See LICENSE. + +Additional terms under section 7 of the GNU GPL version 3: + +1. Attribution (section 7(b)). Anyone who conveys MaliBridge, or a work based on it, in source or + object form must keep the notice "MaliBridge by ASEbrahim" with a link to + https://github.com/ASEbrahim/MaliBridge in the conveyed work's documentation, and, where the + work has a user interface that shows credits, licences or an "about" screen, in that screen. + +2. Names (section 7(e)). This licence grants no right to use the name "MaliBridge" or the + author's name to name or promote a modified version. A modified version must be marked as + changed and must not be presented as MaliBridge or as the author's work. + +Third-party components keep their own licences and notices (third_party/ and the files that name +them). diff --git a/docs/third-party/malibridge/README.md b/docs/third-party/malibridge/README.md new file mode 100644 index 0000000000..97882e8a6e --- /dev/null +++ b/docs/third-party/malibridge/README.md @@ -0,0 +1,33 @@ +# MaliBridge by ASEbrahim + +MaliBridge by ASEbrahim: https://github.com/ASEbrahim/MaliBridge +(GPL-3.0-or-later with the additional terms in NOTICE here, copied unchanged from the project). + +DroidDeck builds MaliBridge from the `external/MaliBridge` submodule, pinned at 48477fe +(v0.5.4) and not modified. Its Vulkan ICD runs inside the Linux runtime and forwards each call +over a Unix socket to its server, which runs in the app on the phone's own Vulkan driver. +DroidDeck uses it only on a GPU without Adreno's KGSL; an Adreno keeps Turnip. + +The DroidDeck side of the bridge (the Setup switches, the server's start and session wiring, the +Mali render node stand-in, the compositor's AHardwareBuffer import off Adreno, the Steam web helper +layout, the socket wait and the DXVK choice for older Vulkan drivers) is Ahmad Sayed Alsayed +Ebrahim's (ASEbrahim) work from https://github.com/ASEbrahim/DroidDeck, kept under their name in +this repository's history. + +MaliBridge's own credits, in its README, include: + +- Vulkan-Headers 1.4.341 (Khronos Group), Apache-2.0 OR MIT: https://github.com/KhronosGroup/Vulkan-Headers +- Arm's HWCPipe (MIT), whose counter layouts its GPU counter reader follows: https://github.com/ARM-software/HWCPipe +- bcdec by Sergii Kudlai, MIT or Unlicense: https://github.com/iOrange/bcdec +- etc2_encode by Lee Gao, MIT: https://github.com/leegao/etc2_encode +- Lee Gao's Mali findings and SPIRV-Tools MaliOptimizationBarrierPass (Apache-2.0): + https://github.com/leegao/SPIRV-Tools, and compat_layer (MIT): https://github.com/leegao/compat_layer +- Julius Pinsker's bionic-vulkan-wrapper PR #228 (MIT) +- David Cimo's droiddeck-mali (GPL-3.0): https://github.com/DavidCimo/droiddeck-mali +- The412Banner's Mali compatibility layer and testing on the DroidDeck branch `test/non-adreno-all` +- taowen's libhybris `arlinux` branch (Apache-2.0): https://github.com/taowen/libhybris/tree/arlinux +- GameNative (GPL-3.0), wallentx's placed-memory layer for DroidDeck (MIT), Arm's published errata, + ANGLE's Mali workarounds, and design notes from Winlator's Vortek + +Each keeps its own licence and notice in the submodule (`third_party/` and the files that name +them). diff --git a/external/MaliBridge b/external/MaliBridge new file mode 160000 index 0000000000..95a1e600a5 --- /dev/null +++ b/external/MaliBridge @@ -0,0 +1 @@ +Subproject commit 95a1e600a51299294e06bb09db2db8cc509fe6a3 diff --git a/tools/build_local.sh b/tools/build_local.sh index 7952d7a0ea..216b1e0dfd 100755 --- a/tools/build_local.sh +++ b/tools/build_local.sh @@ -41,6 +41,10 @@ if [[ ! -x "${java_dir}/bin/java" ]]; then echo "Java 17 not found at ${java_dir}; set JAVA_HOME." >&2 exit 1 fi +if [[ ! -f "${repo_root}/external/MaliBridge/scripts/build-client-linux.sh" ]]; then + echo "external/MaliBridge is empty; run: git submodule update --init" >&2 + exit 1 +fi if ! command -v docker >/dev/null 2>&1; then echo "Docker is required to cross-compile the glibc ARM64 preload libraries." >&2 exit 1 @@ -135,6 +139,7 @@ docker run --rm --platform "${docker_platform}" \ -o "$d/libssbs.so" tools/linuxfs/ssbs/ssbs_adapter.c -ldl aarch64-linux-gnu-strip --strip-unneeded "$d/libssbs.so" mkdir -p "$d/usr/local/bin" + external/MaliBridge/scripts/build-client-linux.sh "$d" aarch64-linux-gnu-gcc aarch64-linux-gnu-gcc -O2 -Wall -Wextra -o "$d/usr/local/bin/droiddeck-clipboard" tools/linuxfs/clipboard/clipboard.c -ldl aarch64-linux-gnu-strip --strip-unneeded "$d/usr/local/bin/droiddeck-clipboard" for script in tools/linuxfs/overlay/usr/local/bin/droiddeck-* tools/linuxfs/overlay/usr/local/bin/steam-compatibility; do diff --git a/tools/components/prepare.py b/tools/components/prepare.py index acccf54e8a..122ba98c94 100644 --- a/tools/components/prepare.py +++ b/tools/components/prepare.py @@ -34,6 +34,9 @@ def identity(name, root=ROOT): for name_ in sorted(set(paths)): if '__pycache__' in name_ or name_.endswith(('.pyc', '.md')): continue + if (root / name_).is_dir(): + values[name_] = subprocess.check_output(['git', 'ls-files', '--stage', '--', name_], cwd=root, text=True).split()[1] + continue content = (root / name_).read_bytes() if b'\0' not in content: content = content.replace(b'\r\n', b'\n') diff --git a/tools/components/recipes.json b/tools/components/recipes.json index ab7d40b4ad..88ae5b79d6 100644 --- a/tools/components/recipes.json +++ b/tools/components/recipes.json @@ -225,6 +225,21 @@ "xz-utils" ] }, + "vkbridge": { + "script": "tools/components/recipes/vkbridge.sh", + "inputs": [ + "external/MaliBridge", + "tools/components/recipes/vkbridge.sh" + ], + "outputs": [ + "app/src/main/assets/linuxfs/usr/local/lib/vkbridge/libvulkan_droidbridge.so", + "app/src/main/assets/linuxfs/usr/local/share/vkbridge/droidbridge_icd.json", + "app/src/main/assets/linuxfs/usr/local/bin/droiddeck-vkbridge-smoke" + ], + "packages": [ + "gcc-aarch64-linux-gnu" + ] + }, "dirt-ws2": { "script": "tools/components/recipes/dirt-ws2.sh", "inputs": [ diff --git a/tools/components/recipes/vkbridge.sh b/tools/components/recipes/vkbridge.sh new file mode 100644 index 0000000000..10b4b521c8 --- /dev/null +++ b/tools/components/recipes/vkbridge.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail +test -f external/MaliBridge/scripts/build-client-linux.sh +bash external/MaliBridge/scripts/build-client-linux.sh app/src/main/assets/linuxfs aarch64-linux-gnu-gcc diff --git a/tools/gamescope/PATCHES.md b/tools/gamescope/PATCHES.md index 32317c4fa6..0dba1a96d5 100644 --- a/tools/gamescope/PATCHES.md +++ b/tools/gamescope/PATCHES.md @@ -209,3 +209,19 @@ the connector's windows (`mangoapp_nudge_app_frame`). With `DROIDDECK_HUD_FRAMES sets `/run/droiddeck-hud/frames`), gamescope maps that file and writes the same commits of connector 0, whether or not a mangoapp runs, plus the focused pid, output size, refresh, Steam focus and engine name. The layout is in the comment above `droiddeck_hud_frames_map`; the app reads it in `hudframes.c`. + +## 0126 steamcompmgr: a topmost focus window keeps other processes' windows beneath it + +EA games on Steam start through the EA app. Its Steam launcher (`EASteamLauncher.exe`) shows the +game's splash as a layered tool window, and the EA app (`EADesktop.exe`, another process) opens its +sign-in window `WS_EX_TOPMOST`. gamescope took the splash as the sign-in's override window, so it was +painted over most of the sign-in and became gamescope's keyboard focus window (Burnout Paradise +Remastered, `gamescopectl focus_info`). On Windows a topmost window stays above every window that is neither topmost nor +owned by it, so a window from another process that is neither is no longer an override candidate for +a topmost focus window. Both windows' pids must be known; gamescope keeps -1 when XRes cannot name the +client, which says nothing about the process. Same-process popups, topmost popups (WebView2 and CEF menus) and windows +transient for the focus window are unchanged. gamescope read `_WINE_HWND_EXSTYLE` only from a +PropertyNotify, and it listens for those from map on, so the style Wine sets before mapping a window +was never known; `map_win` now reads it with the other properties, which the layered-launcher and +Xalia rules rely on too. `tools/tests/test_gamescope_override_stacking.py` compiles the rule from +this patch. diff --git a/tools/gamescope/patches/0126-topmost-focus-outranks-other-process-override.patch b/tools/gamescope/patches/0126-topmost-focus-outranks-other-process-override.patch new file mode 100644 index 0000000000..543705b5d4 --- /dev/null +++ b/tools/gamescope/patches/0126-topmost-focus-outranks-other-process-override.patch @@ -0,0 +1,43 @@ +diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -4220,6 +4220,21 @@ static bool is_same_app_override_decorat + ( candidate->hwndStyleEx & uDecorationStyle ) == uDecorationStyle; + } + ++// Windows keeps a topmost window above every window that is neither topmost nor owned by it, ++// so another process's splash cannot cover a topmost sign-in (the EA app's, over its Steam launcher). ++static bool is_stacked_below_focus( steamcompmgr_win_t *candidate, steamcompmgr_win_t *focus ) ++{ ++ if ( candidate->pid <= 0 || focus->pid <= 0 || candidate->pid == focus->pid || ++ !candidate->hasHwndStyleEx || !focus->hasHwndStyleEx ) ++ return false; ++ ++ if ( candidate->type == steamcompmgr_win_type_t::XWAYLAND && focus->type == steamcompmgr_win_type_t::XWAYLAND && ++ candidate->xwayland().transientFor == focus->xwayland().id ) ++ return false; ++ ++ return ( focus->hwndStyleEx & WS_EX_TOPMOST ) && !( candidate->hwndStyleEx & WS_EX_TOPMOST ); ++} ++ + static bool is_good_override_candidate( steamcompmgr_win_t *override, steamcompmgr_win_t* focus ) + { + // Some Chrome/Edge dropdowns (ie. FH5 xbox login) will automatically close themselves if you +@@ -4235,6 +4250,9 @@ static bool is_good_override_candidate( + if ( is_same_app_override_decoration( override, focus ) ) + return false; + ++ if ( is_stacked_below_focus( override, focus ) ) ++ return false; ++ + if ( override->pid != focus->pid && !windows_share_app( override, focus ) ) + return false; + +@@ -5836,6 +5854,7 @@ map_win(xwayland_ctx_t* ctx, Window id, + w->isSteamStreamingClient = get_prop(ctx, w->xwayland().id, ctx->atoms.steamStreamingClientAtom, 0); + w->isSteamStreamingClientVideo = get_prop(ctx, w->xwayland().id, ctx->atoms.steamStreamingClientVideoAtom, 0); + w->steamAppID = get_prop(ctx, w->xwayland().id, ctx->atoms.gameAtom, 0); ++ w->hwndStyleEx = get_prop(ctx, w->xwayland().id, ctx->atoms.wineHwndStyleEx, 0, &w->hasHwndStyleEx); + + if ( steamMode == true ) + { diff --git a/tools/linuxfs/desktop/droiddeck-desktop b/tools/linuxfs/desktop/droiddeck-desktop index df09229f8b..799a3dee80 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop +++ b/tools/linuxfs/desktop/droiddeck-desktop @@ -114,8 +114,10 @@ fi if [ "$(cat /usr/share/droiddeck/kwin-compositor 2>/dev/null)" = opengl ]; then unset LIBGL_ALWAYS_SOFTWARE QT_QUICK_BACKEND export KWIN_COMPOSE=O2 MESA_LOADER_DRIVER_OVERRIDE=zink GALLIUM_DRIVER=zink LIBGL_KOPPER_DRI2=true - if [ -z "${KWIN_RENDER_NODES:-}" ] && [ -c /dev/dri/renderD0 ]; then - export KWIN_RENDER_NODES=/dev/dri/renderD0 + if [ -z "${KWIN_RENDER_NODES:-}" ]; then + for node in /dev/dri/renderD0 /dev/dri/renderD307 /dev/dri/renderD*; do + if [ -c "$node" ]; then export KWIN_RENDER_NODES="$node"; break; fi + done fi mkdir -p /run/droiddeck/kwin printf '#!/bin/sh\nGALLIUM_THREAD=0 exec /usr/bin/kwin_wayland "$@"\n' > /run/droiddeck/kwin/kwin_wayland diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 608eefd5f8..6f4d21c56b 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -243,6 +243,59 @@ def ubisoft_overlay_off(env): print("droiddeck-game-env: Ubisoft Connect overlay left as is (%s)" % error, file=sys.stderr) +PZ_JVM_FLAGS = ("-XX:+UseG1GC", "-XX:TieredStopAtLevel=1") + + +def zomboid_vm_args(args): + updated = [arg for arg in args if not re.fullmatch(r"-XX:\+Use\w*GC", arg) or arg == "-XX:+UseG1GC"] + for flag in PZ_JVM_FLAGS: + if flag not in updated: + updated.append(flag) + return updated + + +def zomboid_rewrite(node): + changed = False + if isinstance(node, dict): + for key, value in node.items(): + if key == "vmArgs" and isinstance(value, list) and all(isinstance(arg, str) for arg in value): + updated = zomboid_vm_args(value) + if updated != value: + node[key] = updated + changed = True + elif isinstance(value, dict): + changed |= zomboid_rewrite(value) + return changed + + +def project_zomboid_jvm(command): + if len(command) <= 2: + return + exe = Path(command[2]) + if not exe.stem.lower().startswith("projectzomboid"): + return + settings = exe.with_suffix(".json") + try: + with settings.open(encoding="utf-8-sig") as source: + data = json.load(source) + if not zomboid_rewrite(data): + return + handle, staged = tempfile.mkstemp(prefix=".droiddeck-", dir=settings.parent) + try: + with os.fdopen(handle, "w", encoding="utf-8") as target: + json.dump(data, target, indent=4) + target.write("\n") + os.chmod(staged, settings.stat().st_mode & 0o7777) + os.replace(staged, settings) + except BaseException: + os.unlink(staged) + raise + print("droiddeck-game-env: Project Zomboid: G1 garbage collector and C1 JIT only (ZGC overheats and stalls here)", + file=sys.stderr) + except (OSError, ValueError, AttributeError) as error: + print("droiddeck-game-env: Project Zomboid JVM settings left as is (%s)" % error, file=sys.stderr) + + def offline_without_anticheat(command, env): if (env.get("DROIDDECK_ANTICHEAT_OFFLINE") != "1" or len(command) <= 2 or command[1] != "waitforexitandrun" @@ -478,6 +531,14 @@ def apply_config(env, config, app_id, fixes=None): return result +def bridge_feature_level(env): + if env.get("BL_VKBRIDGE") != "1" or env.get("VKD3D_FEATURE_LEVEL") not in ("12_1", "12_2"): + return None + was = env["VKD3D_FEATURE_LEVEL"] + env["VKD3D_FEATURE_LEVEL"] = "12_0" + return "Mali bridge: VKD3D_FEATURE_LEVEL %s capped at 12_0 (no ray tracing or mesh shaders)" % was + + GAME_DEBUG_CHANNELS = ( "timestamp", "pid", "tid", "seh", "unwind", "threadname", "debugstr", "loaddll", "mscoree", ) @@ -931,6 +992,7 @@ def main(): if waiting: command = skip_red_launcher(command) ubisoft_overlay_off(env) + project_zomboid_jvm(command) fixes, extra, notes = engine_fixes(command[2], command[3:]) if len(command) > 2 else ({}, [], []) if not gl_default: fixes.pop("vblank_mode", None) @@ -974,6 +1036,9 @@ def main(): env["AUDIO_DIRECT_MIC"] = "0" env = directaudio_settings(env) env = vram_cap(env) + note = bridge_feature_level(env) + if note: + print("droiddeck-game-env: " + note, file=sys.stderr) env = force_ssbs(command, env) game_cores(env) cpu_topology(env, command) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists index 6bec47b94d..babcb86d3d 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists @@ -24,7 +24,7 @@ read_scripts() { xargs -0 -r awk -v want="${1:-redists}" ' proc[depth] = 1 program = tolower(part[4]) sub(/.*[\\\/]/, "", program) - if (program ~ /vulkan|uplay|ubisoft/) vulkan[depth] = 1 + if (program ~ /vulkan|uplay|ubisoft|eaapp/) vulkan[depth] = 1 next } if (n == 3) pending = part[2] @@ -245,7 +245,7 @@ for system in "${regs[@]}"; do had=() for line in "${kept[@]}"; do had[$line]=1; done printf '%s\n' "${other[@]}" "${kept[@]}" >"$seeded" - echo "== took Vulkan runtime and Ubisoft Connect markers out of $reg" + echo "== took Vulkan runtime, Ubisoft Connect and EA app markers out of $reg" fi if [ ${#had[@]} -gt 0 ] && { [ -z "$id" ] || [ "$id" != "$prev" ]; }; then declare -A held=() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index b0cbc0a553..0c037af472 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -160,7 +160,7 @@ collect_steam_logs() { cp "$fex_state/status.json" "$fex_state/config/Config.json" "$BL_DEBUG_DIR/droiddeck-fex/" 2>/dev/null fi } -trap 'collect_steam_logs 2>/dev/null || true' TERM INT HUP +trap 'bl_stopping=1; collect_steam_logs 2>/dev/null || true' TERM INT HUP if [ -n "${BL_VK_DRIVER:-}" ]; then bl_icd_lib=$(sed -n 's/.*"library_path"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' "$BL_VK_DRIVER" 2>/dev/null | head -1) bl_icd_lib=$(printf '%s' "$bl_icd_lib" | sed 's|\\/|/|g') @@ -177,6 +177,83 @@ if [ -n "${BL_VK_DRIVER:-}" ]; then fi unset bl_icd_lib fi +bl_webhelper_layout() { + if [ -n "${BL_VKBRIDGE_WEBHELPER_ARGS:-}" ]; then + printf '%s\n' "$BL_VKBRIDGE_WEBHELPER_ARGS" + elif [ -z "${BL_VKBRIDGE_CEF_ANGLE:-}" ]; then + echo stock + elif [ "$BL_VKBRIDGE_CEF_ANGLE" = vulkan ] && [ "${BL_VKBRIDGE_CEF_VULKAN:-1}" != 0 ]; then + echo "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan" + else + echo "--use-gl=angle --use-angle=$BL_VKBRIDGE_CEF_ANGLE" + fi +} +bl_now_ms() { + if [ -n "${EPOCHREALTIME:-}" ]; then + local t=${EPOCHREALTIME/[.,]/} + echo $((10#$t / 1000)) + else + date +%s%3N + fi +} +vkbridge_wait_socket() { + local sock=$1 limit=${2:-10000} start now waited + [ -n "$sock" ] || return 1 + if [ -S "$sock" ]; then + echo "== vkbridge: server socket ready (waited 0 ms)" + return 0 + fi + start=$(bl_now_ms) + while :; do + now=$(bl_now_ms) + waited=$((now - start)) + if [ -S "$sock" ]; then + echo "== vkbridge: server socket ready (waited $waited ms; the server listens after its startup probe)" + return 0 + fi + if [ -n "${bl_stopping:-}" ]; then + echo "== vkbridge: no server socket after $waited ms; the session is stopping" + return 1 + fi + if [ "$waited" -ge "$limit" ]; then + echo "== vkbridge: no server socket after $waited ms (gave up at $limit ms)" + return 1 + fi + sleep 0.05 + done +} +if [ "${BL_VKBRIDGE:-0}" = 1 ]; then + bl_vkb_icd=/usr/local/share/vkbridge/droidbridge_icd.json + [ -z "${BL_INSIDE:-}" ] && vkbridge_wait_socket "${VKBRIDGE_SOCKET:-}" "${BL_VKBRIDGE_WAIT_MS:-10000}" + bl_vkb_missing= + [ -r "$bl_vkb_icd" ] || bl_vkb_missing="$bl_vkb_missing icd" + [ -r /usr/local/lib/vkbridge/libvulkan_droidbridge.so ] || bl_vkb_missing="$bl_vkb_missing library" + [ -S "${VKBRIDGE_SOCKET:-}" ] || bl_vkb_missing="$bl_vkb_missing socket" + if [ -z "$bl_vkb_missing" ]; then + export VK_DRIVER_FILES=$bl_vkb_icd VK_ICD_FILENAMES=$bl_vkb_icd + export VKBRIDGE_SOCKET VKBRIDGE_CLIENT_LOG + if [ -r /root/.vkbridge-env ]; then + while IFS='=' read -r _k _v; do + case "$_k" in VKBRIDGE_*|BL_VKBRIDGE_*) export "$_k=$_v" ;; esac + done < /root/.vkbridge-env + [ -z "${BL_INSIDE:-}" ] && echo "== vkbridge: development settings from /root/.vkbridge-env: $(cut -d= -f1 /root/.vkbridge-env | tr '\n' ' ')" + fi + export VKD3D_FEATURE_LEVEL=${VKD3D_FEATURE_LEVEL:-12_0} + unset TU_DEBUG + if [ -z "${BL_INSIDE:-}" ]; then + step "vkbridge self-test" + timeout 60 /usr/local/bin/droiddeck-vkbridge-smoke 2>&1 | sed 's/^/== vkbridge: /' + if command -v vulkaninfo >/dev/null 2>&1; then + timeout 30 vulkaninfo --summary 2>&1 | sed -n '/^Devices:/,$p' | head -40 | sed 's/^/== vulkaninfo: /' + fi + fi + echo "== vulkan driver: Mali bridge ($bl_vkb_icd, server at $VKBRIDGE_SOCKET)" + else + echo "== vulkan driver: Mali bridge requested but NOT usable (icd $bl_vkb_icd, socket ${VKBRIDGE_SOCKET:-unset}; missing:$bl_vkb_missing)" + [ -n "${BL_INSIDE:-}" ] || exit 69 + fi + unset bl_vkb_icd bl_vkb_missing +fi export GAMESCOPE_FORCE_VULKAN_REALTIME=${BL_GAMESCOPE_REALTIME:-0} start_agent() { @@ -307,6 +384,13 @@ if [ -z "${BL_INSIDE:-}" ]; then if [ "$mode" = steam ] && [ "${BL_CURSOR_COMPOSITE:-0}" = 1 ]; then export gamescope_cursor_composite=2 fi + # Through the Mali bridge, Steam's UI flickered while gamescope handed its layers to the phone's + # compositor as separate planes, for a reason not yet found; one composited image does not + # (Mali-G76 MC4: 145 footer flips in 6 s at rest, 0 composited). + if [ "$mode" = steam ] && [ "${BL_VKBRIDGE:-0}" = 1 ] && [ -z "${gamescope_composite_force:-}" ]; then + export gamescope_composite_force=1 + echo "== gamescope: composites every frame (Mali bridge: the Steam UI flickers on separate planes)" + fi args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$nested" -h "$nested_h") if [ "$nested" != "$width" ] || [ "$nested_h" != "$height" ]; then args+=(-S stretch) @@ -1023,6 +1107,28 @@ case $mode in _bl_cef=(-cef-disable-gpu) _bl_ui=(-nobigpicture) fi + if [ "${BL_VKBRIDGE:-0}" = 1 ]; then + # On the GPU the Steam UI held about 400 MB through the bridge (Mali-G76 MC4, 3 GB of RAM); with + # a game loading beside it, Android's low-memory killer took the whole session down. + if [ -z "${BL_VKBRIDGE_CEF_GPU:-}" ]; then + _bl_mem_kb=$(awk '/^MemTotal:/ {print $2}' /proc/meminfo 2>/dev/null) + if [ "${_bl_mem_kb:-0}" -gt 0 ] && [ "$_bl_mem_kb" -lt 4194304 ]; then + BL_VKBRIDGE_CEF_GPU=0 + echo "== steam: $((_bl_mem_kb / 1024)) MB of RAM: the browser UI draws in software to leave games the memory" + fi + fi + if [ "${BL_VKBRIDGE_CEF_GPU:-1}" = 0 ]; then + _bl_cef=(-cef-disable-gpu -cef-disable-gpu-compositing) + echo "== steam: browser UI in software (Mali bridge)" + elif [ "${_bl_cef[0]}" = -cef-force-gpu ]; then + _bl_cef=(-cef-force-gpu -cef-use-gl=angle -cef-use-angle="${BL_VKBRIDGE_CEF_ANGLE:-vulkan}") + fi + [ "${BL_VKBRIDGE_CEF_LOG:-0}" = 1 ] && _bl_cef+=(-cef-enable-logging=stderr -cef-v=1) + [ -n "${BL_VKBRIDGE_CEF_EXTRA:-}" ] && read -r -a _bl_cef_extra <<<"$BL_VKBRIDGE_CEF_EXTRA" && _bl_cef+=("${_bl_cef_extra[@]}") + BL_WEBHELPER_ARGS=$(bl_webhelper_layout) + export BL_WEBHELPER_ARGS + echo "== steam: web helper process layout: $BL_WEBHELPER_ARGS (Mali bridge)" + fi if [ "${BL_STEAM_UI:-}" != desktop ]; then if [ "$steam_x64" = 0 ] || [ "${BL_X64_DECK:-1}" != 0 ]; then _bl_ui+=(-steamdeck -steamos3) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index 0ac9d47e55..131c049062 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -357,6 +357,27 @@ GOG_ROOTS = {"HKEY_LOCAL_MACHINE": "HKEY_LOCAL_MACHINE", "HKLM": "HKEY_LOCAL_MAC "HKEY_CLASSES_ROOT": "HKEY_CLASSES_ROOT", "HKCR": "HKEY_CLASSES_ROOT"} WINE_USER = "C:\\users\\steamuser" +# GOG completes some installs by running a support installer from the game folder (the +# goggame-<id>.script "Execute" action). Under ARM64 FEX that 32-bit self-extractor stops at +# "Path not found", so the values it would write are applied here instead. Only products GOG +# ships no setRegistry action for are listed; a script's own entries always win. +# The Witcher: Enhanced Edition (#694) exits during startup unless the installer's +# HKLM\Software\CD Projekt Red\The Witcher keys exist - the same ones The Witcher's own +# setup writes (InstallFolder, RegionVersion, IsDjinniInstalled) plus its language. +GOG_INSTALL_REGISTRY = { + "1207658924": [ + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "InstallFolder", "string", "{app}\\"), + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "RegionVersion", "string", "US"), + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "IsDjinniInstalled", "dword", 1), + ("HKLM", "Software\\CD Projekt Red\\The Witcher", "Language", "string", "{language}"), + ("HKCU", "Software\\CD Projekt RED\\Witcher\\Settings", "TextLanguage", "string", "{language}"), + ("HKCU", "Software\\CD Projekt RED\\Witcher\\Settings", "VoiceLanguage", "string", "{language}"), + ], +} +# The Witcher's text and voice language IDs, from its installer's registry data. +GOG_LANGUAGE_IDS = {"en": 3, "fr": 11, "de": 10, "es": 12, "it": 13, "ru": 14, "cs": 15, "hu": 16, + "zh": 21, "pl": 5} + def gog_paths(folder, product): app = windows_path(str(folder)) @@ -416,8 +437,94 @@ def gog_entry(arguments, paths): return None -def gog_registry(folder): - entries, skipped = [], 0 +def gog_installed_products(folder): + products = {} + for info in sorted(Path(folder).glob("goggame-*.info")): + product = info.name[len("goggame-"):-len(".info")] + if not product.isdigit(): + continue + try: + products[product] = json.loads(info.read_text(encoding="utf-8-sig")) + except (OSError, ValueError): + products[product] = {} + return products + + +def gog_language_id(info): + languages = info.get("languages") if isinstance(info, dict) else None + if isinstance(languages, str): + languages = [languages] + code = str(languages[0]).lower()[:2] if isinstance(languages, list) and languages else "" + return GOG_LANGUAGE_IDS.get(code, GOG_LANGUAGE_IDS["en"]) + + +GOG_VALUE_HIVES = {"hklm": "local_machine", "hkey_local_machine": "local_machine", + "hkcu": "current_user", "hkey_current_user": "current_user", + "hkcr": "classes_root", "hkey_classes_root": "classes_root"} + + +def gog_value_key(root, section, name, view32=True): + """A registry value's identity, keeping the root and the 32-bit view apart. + + The fallback import always targets the 32-bit view (`/reg:32`), which Wine keeps under + `Software\\Wow6432Node` for HKLM: a native HKLM value must not pass for the 32-bit one. + HKCU\\Software is shared by both views, so its values read the same either way. + """ + text = section.replace("\\\\", "\\").strip("\\").lower() + hive = GOG_VALUE_HIVES.get(root.lower(), root.lower()) + if text.startswith("software\\wow6432node\\"): + text = text[len("software\\wow6432node\\"):] + elif hive == "local_machine" and not view32 and text.startswith("software\\"): + text = "native\\" + text + elif text.startswith("software\\"): + text = text[len("software\\"):] + return "%s|%s|%s" % (hive, text, name.lower()) + + +def gog_registry_values(pfx): + """Values already in the prefix, so install defaults never overwrite a player's choice.""" + values = set() + for file, root in (("system.reg", "hklm"), ("user.reg", "hkcu")): + try: + lines = (pfx / file).read_text(encoding="utf-8", errors="ignore").splitlines() + except OSError: + continue + section = "" + for line in lines: + if line.startswith("["): + end = line.find("]") + section = line[1:end] if end > 0 else line[1:] + continue + match = re.match(r'^"([^"]+)"=', line) + if match and section: + values.add(gog_value_key(root, section, match.group(1), view32=False)) + return values + + +def gog_scripted_products(folder): + products = set() + for script in sorted(Path(folder).glob(GOG_SCRIPTS)): + try: + actions = json.loads(script.read_text(encoding="utf-8-sig")).get("actions") + except (OSError, ValueError, AttributeError): + continue + if isinstance(actions, list) and any( + isinstance(action, dict) and isinstance(action.get("install"), dict) + and action["install"].get("action") == "setRegistry" for action in actions): + products.add(script.name[len("goggame-"):-len(".script")]) + return products + + +def gog_expected_values(folder): + """The fallback values a launch must find, so the marker never hides one that was deleted.""" + scripted = gog_scripted_products(folder) + return [gog_value_key(root, subkey, name) for product in gog_installed_products(folder) + if product in GOG_INSTALL_REGISTRY and product not in scripted + for root, subkey, name, _kind, _value in GOG_INSTALL_REGISTRY[product]] + + +def gog_registry(folder, existing=()): + entries, skipped, scripted = [], 0, set() for script in sorted(Path(folder).glob(GOG_SCRIPTS)): product = script.name[len("goggame-"):-len(".script")] try: @@ -434,11 +541,28 @@ def gog_registry(folder): skipped += 1 else: entries.append(entry) + scripted.add(product) + for product, info in gog_installed_products(folder).items(): + if product in scripted or product not in GOG_INSTALL_REGISTRY: + continue + paths = dict(gog_paths(folder, product), language=str(gog_language_id(info))) + for root, subkey, name, kind, value in GOG_INSTALL_REGISTRY[product]: + if gog_value_key(root, subkey, name) in existing: + continue + entry = gog_entry({"root": root, "subkey": subkey, "valueName": name, + "valueType": kind, "valueData": value}, paths) + if entry is None: + skipped += 1 + else: + entries.append(entry) return entries, skipped def apply_gog_registry(folder, compat_data, proton, timeout=90, installation=None): - entries, skipped = gog_registry(folder) + pfx = Path(compat_data) / "pfx" if compat_data else None + existing = gog_registry_values(pfx) if pfx else set() + entries, skipped = gog_registry(folder, existing) + expected = gog_expected_values(folder) if installation: product = str(installation["id"]) if not product.isdigit(): @@ -465,10 +589,10 @@ def apply_gog_registry(folder, compat_data, proton, timeout=90, installation=Non return "no-proton" + note text = "Windows Registry Editor Version 5.00\r\n\r\n" + "".join(entry + "\r\n\r\n" for entry in entries) stamp = hashlib.sha256(text.encode("utf-8")).hexdigest() - pfx = Path(compat_data) / "pfx" marker = pfx / GOG_REGISTRY_MARK try: - if marker.is_file() and marker.read_text() == stamp and (pfx / "system.reg").is_file(): + if (marker.is_file() and marker.read_text() == stamp and (pfx / "system.reg").is_file() + and set(expected) <= existing): return "ready" + note Path(compat_data).mkdir(parents=True, exist_ok=True) with tempfile.TemporaryDirectory(prefix="droiddeck-gog-") as tmp: diff --git a/tools/linuxfs/preload/drm.c b/tools/linuxfs/preload/drm.c index 101512387f..37784c3d94 100644 --- a/tools/linuxfs/preload/drm.c +++ b/tools/linuxfs/preload/drm.c @@ -5,6 +5,7 @@ #include <pthread.h> #include <stdint.h> #include <stdlib.h> +#include <sys/file.h> #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/syscall.h> @@ -34,7 +35,8 @@ static int is_kgsl(int fd) { struct stat st; pthread_mutex_lock(&lock); if (kgsl_state == 0) { - kgsl_state = stat("/dev/kgsl-3d0", &st) == 0 ? 1 : -1; + const char *standin = getenv("BL_DRM_STANDIN"); + kgsl_state = stat("/dev/kgsl-3d0", &st) == 0 || (standin && *standin && stat(standin, &st) == 0) ? 1 : -1; kgsl_dev = st.st_rdev; } pthread_mutex_unlock(&lock); @@ -49,18 +51,42 @@ static void *real(const char *name) { return fn; } +static int same_by_flock(int a, int b) { + struct stat sa, sb; + if (fstat(a, &sa) || fstat(b, &sb) || sa.st_dev != sb.st_dev || sa.st_ino != sb.st_ino || + flock(a, LOCK_EX | LOCK_NB)) { + return 0; + } + int same = flock(b, LOCK_EX | LOCK_NB) == 0; + flock(a, LOCK_UN); + return same; +} + static int same_file_description(int a, int b) { if (a == b) { return 1; } -#ifdef SYS_kcmp int saved_errno = errno; - long ret = syscall(SYS_kcmp, getpid(), getpid(), 0 , a, b); - errno = saved_errno; - return ret == 0; -#else - return 0; + int ret = -1; +#ifdef SYS_kcmp + static int kcmp_missing; + if (!kcmp_missing) { + long k = syscall(SYS_kcmp, getpid(), getpid(), 0, a, b); + if (k >= 0) { + ret = k == 0; + } else if (errno == ENOSYS || errno == EPERM) { + kcmp_missing = 1; + } else { + ret = 0; + } + } #endif + if (ret < 0) { + const char *standin = getenv("BL_DRM_STANDIN"); + ret = standin && *standin ? same_by_flock(a, b) : 0; + } + errno = saved_errno; + return ret; } static int find_handle_locked(int fd, uint32_t handle) { diff --git a/tools/linuxfs/preload/subreaper.c b/tools/linuxfs/preload/subreaper.c new file mode 100644 index 0000000000..90ed7548d3 --- /dev/null +++ b/tools/linuxfs/preload/subreaper.c @@ -0,0 +1,24 @@ +/* tools/linuxfs/preload/subreaper.c + * + * Mark every process that loads libblsession.so as a child subreaper. + * + * wlroots starts Xwayland with a double fork: gamescope -> middle process + * (exits immediately) -> Xwayland. With no subreaper in the tree, Xwayland + * is reparented to pid 1 and becomes an orphan. On some vendor kernels + * (observed on Meizu / Flyme 12) an orphan reaper SIGKILLs it in that window, + * which makes gamescope wait forever in wlserver_init() and the UI hangs on + * "Starting display and audio". + * + * With PR_SET_CHILD_SUBREAPER the reparent target becomes the nearest marked + * ancestor instead of init, so the orphan event never happens. + * + * Harmless for processes that do not fork, and cheap (one syscall at load). + */ +#define _GNU_SOURCE +#include <sys/prctl.h> + +__attribute__((constructor)) +static void bl_session_set_subreaper(void) +{ + (void)prctl(PR_SET_CHILD_SUBREAPER, 1); +} diff --git a/tools/tests/test_component_prepare.py b/tools/tests/test_component_prepare.py index b513c8fe75..d86fff9b3c 100644 --- a/tools/tests/test_component_prepare.py +++ b/tools/tests/test_component_prepare.py @@ -57,6 +57,26 @@ class ComponentPrepareTest(unittest.TestCase): script.write_text(script.read_text() + '\nprintf changed\n') self.assertNotEqual(changed, components.identity('fake', self.root)) + def test_identity_follows_a_submodule_commit(self): + library = self.root / 'library' + subprocess.run(['git', 'init', '-q', str(library)], check=True) + def commit(text): + (library / 'source.c').write_text(text) + subprocess.run(['git', '-C', str(library), 'add', '.'], check=True) + subprocess.run(['git', '-C', str(library), '-c', 'user.name=Test Developer', '-c', 'user.email=test@example.test', + 'commit', '-qm', text], check=True) + return subprocess.check_output(['git', '-C', str(library), 'rev-parse', 'HEAD'], text=True).strip() + first = commit('int a;\n') + subprocess.run(['git', '-C', str(self.root), 'add', 'library'], check=True) + spec = dict(script='tools/components/recipes/fake.sh', inputs=['library'], outputs=[]) + (self.root / components.REGISTRY).write_text(json.dumps(dict(fake=spec))) + original = components.identity('fake', self.root) + commit('int b;\n') + self.assertEqual(original, components.identity('fake', self.root)) + subprocess.run(['git', '-C', str(self.root), 'add', 'library'], check=True) + self.assertNotEqual(original, components.identity('fake', self.root)) + self.assertNotEqual(first, subprocess.check_output(['git', '-C', str(library), 'rev-parse', 'HEAD'], text=True).strip()) + def test_tool_requirements_are_installed_in_one_union(self): definitions = dict(one=dict(packages=['gcc', 'cmake']), two=dict(packages=['gcc', 'qemu-user'])) with patch.object(components, 'registry', return_value=definitions), patch.object(components.subprocess, 'run') as run: diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 1d2ea64415..5c72ac78fa 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -649,6 +649,15 @@ class GameEnvironmentTest(unittest.TestCase): self.assertEqual(evaluate(), (0, 2)) self.assertEqual(evaluate("changed"), (0, 3)) + def test_the_mali_bridge_caps_the_vkd3d_feature_level(self): + bridge = {"BL_VKBRIDGE": "1", "VKD3D_FEATURE_LEVEL": "12_2"} + self.assertIn("capped", MODULE["bridge_feature_level"](bridge)) + self.assertEqual(bridge["VKD3D_FEATURE_LEVEL"], "12_0") + for env in ({"BL_VKBRIDGE": "1", "VKD3D_FEATURE_LEVEL": "11_1"}, {"VKD3D_FEATURE_LEVEL": "12_2"}, {"BL_VKBRIDGE": "1"}): + before = dict(env) + self.assertIsNone(MODULE["bridge_feature_level"](env)) + self.assertEqual(env, before) + def test_profile_precedence_and_unset(self): env = {"KEEP": "inherited", "REMOVE": "inherited", "CUSTOM": "launch option"} config = {"version": 1, "shared": {"CUSTOM": "shared"}, "games": {"42": {"REMOVE": None, "CUSTOM": "game", "EMPTY": ""}}} @@ -2026,6 +2035,51 @@ class DirectAudioPrefixTest(unittest.TestCase): self.assertIsNone(self.link("system32")) +class ProjectZomboidJvmTest(unittest.TestCase): + ARGS = ["-Djava.awt.headless=true", "-Xmx3072m", "-XX:+UseZGC", "-XX:-CreateCoredumpOnCrash"] + + def launch(self, tmp, args=None, stem="ProjectZomboid64"): + settings = Path(tmp) / (stem + ".json") + settings.write_text(json.dumps({"mainClass": "zombie/gameStates/MainScreenState", "vmArgs": args or self.ARGS})) + command = ["proton", "waitforexitandrun", str(Path(tmp) / (stem + ".exe"))] + return settings, command + + def test_zgc_becomes_g1_and_the_c1_jit_flag_is_added_once(self): + with tempfile.TemporaryDirectory() as tmp: + settings, command = self.launch(tmp) + MODULE["project_zomboid_jvm"](command) + data = json.loads(settings.read_text()) + self.assertEqual(data["vmArgs"], ["-Djava.awt.headless=true", "-Xmx3072m", "-XX:-CreateCoredumpOnCrash", + "-XX:+UseG1GC", "-XX:TieredStopAtLevel=1"]) + self.assertEqual(data["mainClass"], "zombie/gameStates/MainScreenState") + before = settings.read_text() + MODULE["project_zomboid_jvm"](command) + self.assertEqual(settings.read_text(), before) + + def test_other_collectors_and_windows_specific_lists_are_rewritten(self): + with tempfile.TemporaryDirectory() as tmp: + settings, command = self.launch(tmp) + settings.write_text(json.dumps({"vmArgs": ["-XX:+UseParallelGC", "-Xmx1g"], + "windows": {"10.0.17134": {"vmArgs": ["-XX:+UseZGC", "-XX:+UseG1GC"]}}})) + MODULE["project_zomboid_jvm"](command) + data = json.loads(settings.read_text()) + flags = ["-XX:+UseG1GC", "-XX:TieredStopAtLevel=1"] + self.assertEqual(data["vmArgs"], ["-Xmx1g"] + flags) + self.assertEqual(data["windows"]["10.0.17134"]["vmArgs"], flags) + + def test_other_games_and_unreadable_files_are_left_alone(self): + with tempfile.TemporaryDirectory() as tmp: + settings, command = self.launch(tmp, stem="Other") + before = settings.read_text() + MODULE["project_zomboid_jvm"](command) + self.assertEqual(settings.read_text(), before) + settings.write_text("{") + MODULE["project_zomboid_jvm"](command[:2] + [str(Path(tmp) / "Other.exe")]) + (Path(tmp) / "ProjectZomboid64.json").write_text("{") + MODULE["project_zomboid_jvm"](command[:2] + [str(Path(tmp) / "ProjectZomboid64.exe")]) + self.assertEqual((Path(tmp) / "ProjectZomboid64.json").read_text(), "{") + + class UbisoftOverlayTest(unittest.TestCase): SETTINGS = ( "language:\n code: en-US\n" diff --git a/tools/tests/test_gamescope_override_stacking.py b/tools/tests/test_gamescope_override_stacking.py new file mode 100644 index 0000000000..c97e160808 --- /dev/null +++ b/tools/tests/test_gamescope_override_stacking.py @@ -0,0 +1,101 @@ +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + + +ROOT = Path(__file__).resolve().parents[2] +PATCH = ROOT / "tools/gamescope/patches/0126-topmost-focus-outranks-other-process-override.patch" + + +def patched_rule(): + added = [line[1:] for line in PATCH.read_text().splitlines() if line.startswith("+") and not line.startswith("+++")] + text = "\n".join(added) + start = text.index("static bool is_stacked_below_focus") + return text[start:text.index("\n}\n", start) + 3] + + +PREAMBLE = r''' +#include <cassert> +#include <cstdint> +#include <cstdio> + +static constexpr uint32_t WS_EX_TOPMOST = 0x00000008u; +static constexpr uint32_t WS_EX_TOOLWINDOW = 0x00000080u; +static constexpr uint32_t WS_EX_LAYERED = 0x00080000u; + +enum class steamcompmgr_win_type_t { XWAYLAND, XDG }; +struct xwayland_t { unsigned long id = 0; unsigned long transientFor = 0; }; +struct steamcompmgr_win_t { + int pid = 0; + bool hasHwndStyleEx = false; + uint32_t hwndStyleEx = 0; + steamcompmgr_win_type_t type = steamcompmgr_win_type_t::XWAYLAND; + xwayland_t x; + xwayland_t &xwayland() { return x; } +}; + +static steamcompmgr_win_t win(int pid, unsigned long id, uint32_t exstyle) { + steamcompmgr_win_t w; + w.pid = pid; + w.x.id = id; + w.hasHwndStyleEx = true; + w.hwndStyleEx = exstyle; + return w; +} +''' + +MAIN = r''' +int main() { + steamcompmgr_win_t signin = win(4407, 0x2c00008, WS_EX_TOPMOST); + steamcompmgr_win_t splash = win(4055, 0x1c00005, WS_EX_LAYERED | WS_EX_TOOLWINDOW); + assert(is_stacked_below_focus(&splash, &signin)); + + steamcompmgr_win_t dropdown = win(4407, 0x2c00010, WS_EX_TOOLWINDOW); + assert(!is_stacked_below_focus(&dropdown, &signin)); + + steamcompmgr_win_t menu = win(5120, 0x3000004, WS_EX_TOPMOST | WS_EX_TOOLWINDOW); + assert(!is_stacked_below_focus(&menu, &signin)); + + steamcompmgr_win_t game = win(4407, 0x2c00008, 0); + assert(!is_stacked_below_focus(&splash, &game)); + + steamcompmgr_win_t owned = win(4055, 0x1c00007, 0); + owned.x.transientFor = signin.x.id; + assert(!is_stacked_below_focus(&owned, &signin)); + + steamcompmgr_win_t unknown = win(4055, 0x1c00009, 0); + unknown.hasHwndStyleEx = false; + assert(!is_stacked_below_focus(&unknown, &signin)); + + steamcompmgr_win_t no_pid = win(-1, 0x1c0000b, WS_EX_LAYERED | WS_EX_TOOLWINDOW); + assert(!is_stacked_below_focus(&no_pid, &signin)); + steamcompmgr_win_t signin_no_pid = win(-1, 0x2c00008, WS_EX_TOPMOST); + assert(!is_stacked_below_focus(&splash, &signin_no_pid)); + + puts("ok"); + return 0; +} +''' + + +@unittest.skipUnless(shutil.which("c++"), "needs a C++ compiler") +class OverrideStackingTest(unittest.TestCase): + def test_a_topmost_focus_keeps_other_process_windows_beneath_it(self): + with tempfile.TemporaryDirectory() as tmp: + source = Path(tmp) / "stacking.cpp" + binary = Path(tmp) / "stacking" + source.write_text(PREAMBLE + patched_rule() + MAIN) + subprocess.run(["c++", "-std=c++17", "-Wall", "-Werror", str(source), "-o", str(binary)], check=True) + self.assertEqual(subprocess.run([str(binary)], capture_output=True, text=True, check=True).stdout.strip(), "ok") + + def test_map_win_reads_the_wine_extended_style(self): + hunks = PATCH.read_text().split("\n@@ ") + map_win = next(hunk for hunk in hunks if "map_win(" in hunk.split("\n", 1)[0]) + added = [line[1:].strip() for line in map_win.splitlines() if line.startswith("+")] + self.assertIn("w->hwndStyleEx = get_prop(ctx, w->xwayland().id, ctx->atoms.wineHwndStyleEx, 0, &w->hasHwndStyleEx);", added) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_seed_redists.py b/tools/tests/test_seed_redists.py index bc71403f8b..1440b41b0f 100644 --- a/tools/tests/test_seed_redists.py +++ b/tools/tests/test_seed_redists.py @@ -64,6 +64,31 @@ UBISOFT_SCRIPT = r'''"installscript" } ''' +EA_SCRIPT = r'''"installscript" +{ + "Run Process" + { + "EADesktopSetup" + { + "process 1" "%INSTALLDIR%\\__Installer\\Origin\\redist\\internal\\EAappInstaller.exe" + "command 1" "EAX_LAUNCH_CLIENT=0 IGNORE_INSTALLED=1" + "HasRunStringKey" "HKEY_LOCAL_MACHINE\\SOFTWARE\\Electronic Arts\\EA Desktop\\InstallSuccessful" + "HasRunStringValue" "true" + "RunType" "1" + } + "Windows6.1-KB2670838-x64.msu" + { + "process 1" "%INSTALLDIR%\\__Installer\\customcomponent\\patch_KB2670838_x64\\Windows6.1-KB2670838-x64.msu" + "command 1" "/quiet" + "Requirement_OS" + { + "OSType" "Windows 7" + } + } + } +} +''' + class SeedRedistsTest(unittest.TestCase): def setUp(self): @@ -373,14 +398,17 @@ class SeedRedistsTest(unittest.TestCase): self.assertEqual(self.reg.read_text().count('"Vulkan111080"'), 2) - def ubisoft(self): - script = self.tmp / "legacycompat/evaluatorscript_447040.vdf" + def evaluator(self, appid, install_script): + script = self.tmp / ("legacycompat/evaluatorscript_%s.vdf" % appid) script.parent.mkdir(parents=True) - script.write_text('"evaluatorscript"\n{\n\t"appid"\t\t"447040"\n\t"1"\n' - + "\n".join("\t" + line for line in UBISOFT_SCRIPT.splitlines()) + "\n}\n") + script.write_text('"evaluatorscript"\n{\n\t"appid"\t\t"%s"\n\t"1"\n' % appid + + "\n".join("\t" + line for line in install_script.splitlines()) + "\n}\n") env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_SCRIPTS=str(script)) return subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, text=True, check=True) + def ubisoft(self): + return self.evaluator("447040", UBISOFT_SCRIPT) + def test_the_ubisoft_connect_installer_is_left_to_run(self): self.ubisoft() self.assertIn('"easyanticheat"=dword:00000001', self.user.read_text()) @@ -399,7 +427,28 @@ class SeedRedistsTest(unittest.TestCase): result = self.ubisoft() self.assertNotIn("Ubisoft Connect PC Client", self.reg.read_text()) self.assertNotIn("Ubisoft Connect PC Client", (self.reg.parent / ".droiddeck-redists").read_text()) - self.assertIn("Ubisoft Connect markers out", result.stdout) + self.assertIn("Ubisoft Connect and EA app markers out", result.stdout) + + def test_the_ea_app_installer_is_left_to_run(self): + self.evaluator("1238080", EA_SCRIPT) + reg = self.reg.read_text() + self.assertNotIn("EADesktopSetup", reg) + self.assertEqual(reg.count('"Windows6.1-KB2670838-x64.msu"=dword:00000001'), 2) + self.assertNotIn("EADesktopSetup", (self.reg.parent / ".droiddeck-redists").read_text()) + + def test_an_ea_app_marker_an_earlier_seeding_wrote_comes_out(self): + marker = "HKEY_LOCAL_MACHINE\\\\Software\\\\Valve\\\\Steam\\\\Apps\\\\1238080\tEADesktopSetup" + self.reg.write_text( + "WINE REGISTRY Version 2\n" + "\n[Software\\\\Valve\\\\Steam\\\\Apps\\\\1238080] 1793680524\n" + '"EADesktopSetup"=dword:00000001\n' + "\n[Software\\\\Wow6432Node\\\\Valve\\\\Steam\\\\Apps\\\\1238080] 1793680524\n" + '"EADesktopSetup"=dword:00000001\n') + (self.reg.parent / ".droiddeck-redists").write_text(marker + "\n") + result = self.evaluator("1238080", EA_SCRIPT) + self.assertNotIn("EADesktopSetup", self.reg.read_text()) + self.assertNotIn("EADesktopSetup", (self.reg.parent / ".droiddeck-redists").read_text()) + self.assertIn("EA app markers out", result.stdout) if __name__ == "__main__": unittest.main() diff --git a/tools/tests/test_session_vkbridge_wait.py b/tools/tests/test_session_vkbridge_wait.py new file mode 100644 index 0000000000..bbd4fdb264 --- /dev/null +++ b/tools/tests/test_session_vkbridge_wait.py @@ -0,0 +1,127 @@ +import os +import re +import shutil +import socket +import subprocess +import tempfile +import threading +import time +import unittest +from pathlib import Path + +SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-session" + + +def wait_functions(): + text = SESSION.read_text() + found = [] + for name in ("bl_now_ms", "vkbridge_wait_socket"): + match = re.search(r"^%s\(\) \{\n.*?^\}\n" % name, text, re.M | re.S) + if match: + found.append(match.group(0)) + return found + + +class VkBridgeSocketWaitTest(unittest.TestCase): + def setUp(self): + self.root = Path(tempfile.mkdtemp()) + self.addCleanup(shutil.rmtree, self.root, True) + self.sock = self.root / "vkbridge" / "server.sock" + self.sock.parent.mkdir() + self.listeners = [] + self.addCleanup(lambda: [s.close() for s in self.listeners]) + + def listen(self): + listener = socket.socket(socket.AF_UNIX) + listener.bind(str(self.sock)) + listener.listen(1) + self.listeners.append(listener) + + def listen_after(self, seconds): + timer = threading.Timer(seconds, self.listen) + timer.start() + self.addCleanup(timer.cancel) + + def run_wait(self, limit_ms, prelude=""): + functions = wait_functions() + self.assertEqual(2, len(functions), "droiddeck-session lacks bl_now_ms() or vkbridge_wait_socket()") + script = "set -u\n" + "".join(functions) + prelude + script += 'if vkbridge_wait_socket "$1" "$2"; then echo USABLE; else echo FALLBACK; fi\n' + started = time.monotonic() + out = subprocess.run(["bash", "-c", script, "session", str(self.sock), str(limit_ms)], + capture_output=True, text=True, timeout=30, check=True).stdout + return out, time.monotonic() - started + + def waited_ms(self, out): + match = re.search(r"waited (\d+) ms|after (\d+) ms", out) + self.assertIsNotNone(match, out) + return int(match.group(1) or match.group(2)) + + def test_a_socket_already_listening_is_used_at_once(self): + self.listen() + out, elapsed = self.run_wait(10000) + self.assertTrue(out.endswith("USABLE\n"), out) + self.assertIn("== vkbridge: server socket ready (waited 0 ms)", out) + self.assertLess(elapsed, 2) + + def test_a_server_still_probing_is_waited_for(self): + self.listen_after(0.4) + out, elapsed = self.run_wait(10000) + self.assertTrue(out.endswith("USABLE\n"), out) + self.assertIn("== vkbridge: server socket ready (waited ", out) + waited = self.waited_ms(out) + self.assertGreaterEqual(waited, 300, out) + self.assertLess(waited, 5000, out) + self.assertLess(elapsed, 6) + + def test_no_server_falls_back_after_the_limit(self): + out, elapsed = self.run_wait(300) + self.assertTrue(out.endswith("FALLBACK\n"), out) + self.assertIn("== vkbridge: no server socket after ", out) + self.assertIn("(gave up at 300 ms)", out) + self.assertGreaterEqual(self.waited_ms(out), 300) + self.assertLess(elapsed, 5) + + def test_a_plain_file_is_not_a_socket(self): + self.sock.write_text("stale") + out, _ = self.run_wait(200) + self.assertTrue(out.endswith("FALLBACK\n"), out) + + def test_a_stopping_session_does_not_wait(self): + out, elapsed = self.run_wait(10000, prelude="bl_stopping=1\n") + self.assertTrue(out.endswith("FALLBACK\n"), out) + self.assertIn("the session is stopping", out) + self.assertLess(elapsed, 2) + + def test_no_socket_path_is_a_fallback_without_waiting(self): + functions = "".join(wait_functions()) + out = subprocess.run(["bash", "-c", "set -u\n" + functions + + 'if vkbridge_wait_socket "" 10000; then echo USABLE; else echo FALLBACK; fi\n'], + capture_output=True, text=True, timeout=10, check=True).stdout + self.assertEqual("FALLBACK\n", out) + + +class VkBridgeSessionCheckTest(unittest.TestCase): + + def setUp(self): + self.text = SESSION.read_text() + match = re.search(r'^if \[ "\$\{BL_VKBRIDGE:-0\}" = 1 \]; then\n.*?^fi\n', self.text, re.M | re.S) + self.assertIsNotNone(match) + self.block = match.group(0) + + def test_the_first_pass_waits_before_the_usability_check(self): + wait = self.block.index("vkbridge_wait_socket") + check = self.block.index('[ -S "${VKBRIDGE_SOCKET:-}" ]') + self.assertLess(wait, check) + self.assertIn('[ -z "${BL_INSIDE:-}" ] && vkbridge_wait_socket', self.block) + + def test_the_fallback_message_names_what_is_missing(self): + self.assertIn("Mali bridge requested but NOT usable", self.block) + self.assertIn("missing:$bl_vkb_missing", self.block) + + def test_a_stop_ends_the_wait(self): + self.assertRegex(self.text, r"trap '[^']*bl_stopping=1[^']*' TERM INT HUP") + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_session_webhelper_layout.py b/tools/tests/test_session_webhelper_layout.py new file mode 100644 index 0000000000..f14afd61da --- /dev/null +++ b/tools/tests/test_session_webhelper_layout.py @@ -0,0 +1,48 @@ +import os +import re +import subprocess +import unittest +from pathlib import Path + +SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-session" +KEYS = ("BL_VKBRIDGE_WEBHELPER_ARGS", "BL_VKBRIDGE_CEF_ANGLE", "BL_VKBRIDGE_CEF_VULKAN") + + +def layout_function(): + match = re.search(r"^bl_webhelper_layout\(\) \{\n.*?^\}\n", SESSION.read_text(), re.M | re.S) + return match.group(0) if match else None + + +class WebhelperLayoutTest(unittest.TestCase): + def layout(self, **settings): + function = layout_function() + self.assertIsNotNone(function, "droiddeck-session lacks bl_webhelper_layout()") + env = {k: v for k, v in os.environ.items() if k not in KEYS} + env.update(settings) + return subprocess.run(["bash", "-c", "set -u\n" + function + "bl_webhelper_layout\n"], env=env, + capture_output=True, text=True, check=True).stdout.strip() + + def test_unset_keeps_steams_own_layout(self): + self.assertEqual(self.layout(), "stock") + + def test_angle_on_vulkan_brings_chromiums_vulkan_compositing(self): + self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="vulkan"), + "--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan") + + def test_vulkan_compositing_can_be_left_off(self): + self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="vulkan", BL_VKBRIDGE_CEF_VULKAN="0"), + "--use-gl=angle --use-angle=vulkan") + + def test_other_angle_backends_get_only_the_angle_switches(self): + self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="gl"), "--use-gl=angle --use-angle=gl") + + def test_explicit_layout_wins(self): + self.assertEqual(self.layout(BL_VKBRIDGE_CEF_ANGLE="vulkan", BL_VKBRIDGE_WEBHELPER_ARGS="--x +Y"), + "--x +Y") + + def test_the_steam_block_uses_it(self): + self.assertIn("BL_WEBHELPER_ARGS=$(bl_webhelper_layout)", SESSION.read_text()) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_store_launch.py b/tools/tests/test_store_launch.py index fcdcbb21ec..7ea5a1ae79 100644 --- a/tools/tests/test_store_launch.py +++ b/tools/tests/test_store_launch.py @@ -438,6 +438,120 @@ class GogRegistry(unittest.TestCase): ], entries) self.assertEqual(3, skipped) + def test_a_game_whose_support_installer_cannot_run_gets_the_install_registry(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'language': 'English', 'languages': ['en-US']})) + gog_script(folder, '1207658924', [ + {'install': {'action': 'Execute', 'arguments': {'executable': 'galaxy_the_witcher_enhanced_edition_2.1.0.15.exe'}}}, + ]) + entries, skipped = store.gog_registry(folder) + app = store.windows_path(str(folder)).replace('\\', '\\\\') + self.assertEqual([ + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"InstallFolder"="%s\\\\"' % app, + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"RegionVersion"="US"', + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"IsDjinniInstalled"=dword:00000001', + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"Language"="3"', + '[HKEY_CURRENT_USER\\Software\\CD Projekt RED\\Witcher\\Settings]\r\n"TextLanguage"="3"', + '[HKEY_CURRENT_USER\\Software\\CD Projekt RED\\Witcher\\Settings]\r\n"VoiceLanguage"="3"', + ], entries) + self.assertEqual(0, skipped) + + def test_a_players_language_choice_is_not_overwritten(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + proton = Path(root) / 'proton' + proton.write_text('selected Proton') + data = Path(root) / 'compat' + (data / 'pfx').mkdir(parents=True) + (data / 'pfx/user.reg').write_text( + '[Software\\\\OtherApp] 1\n"InstallFolder"="C:\\\\Other"\n\n' + '[Software\\\\CD Projekt RED\\\\Witcher\\\\Settings] 1\n"TextLanguage"="5"\n') + imported = [] + def run(argv, **kwargs): + imported.append(Path(argv[4][2:].replace('\\', '/')).read_bytes()[2:].decode('utf-16-le')) + (data / 'pfx/system.reg').write_text('Wine registry') + return __import__('subprocess').CompletedProcess(argv, 0) + with patch.object(store.subprocess, 'run', side_effect=run): + store.apply_gog_registry(folder, str(data), str(proton)) + text = imported[0] + self.assertNotIn('"TextLanguage"', text) + self.assertIn('"VoiceLanguage"', text) + self.assertIn('"InstallFolder"', text) + + def test_malformed_language_metadata_falls_back_to_english(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': 3})) + entries, _ = store.gog_registry(folder) + self.assertIn('"Language"="3"', entries[3]) + + def test_a_native_hklm_value_does_not_replace_the_32_bit_fallback(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + pfx = Path(root) / 'pfx' + pfx.mkdir() + (pfx / 'system.reg').write_text( + '[Software\\\\CD Projekt Red\\\\The Witcher] 1\n"InstallFolder"="C:\\\\Native"\n') + entries, _ = store.gog_registry(folder, store.gog_registry_values(pfx)) + self.assertTrue(any('"InstallFolder"' in entry for entry in entries)) + (pfx / 'system.reg').write_text( + '[Software\\\\Wow6432Node\\\\CD Projekt Red\\\\The Witcher] 1\n"InstallFolder"="C:\\\\32bit"\n') + entries, _ = store.gog_registry(folder, store.gog_registry_values(pfx)) + self.assertFalse(any('"InstallFolder"' in entry for entry in entries)) + + def test_a_deleted_fallback_value_is_imported_again(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + proton = Path(root) / 'proton' + proton.write_text('selected Proton') + data = Path(root) / 'compat' + pfx = data / 'pfx' + pfx.mkdir(parents=True) + imported = [] + def run(argv, **kwargs): + imported.append(argv) + (pfx / 'system.reg').write_text( + '[Software\\\\Wow6432Node\\\\CD Projekt Red\\\\The Witcher] 1\n' + '"InstallFolder"="C:\\\\Game"\n"RegionVersion"="US"\n' + '"IsDjinniInstalled"=dword:00000001\n"Language"="3"\n') + (pfx / 'user.reg').write_text( + '[Software\\\\CD Projekt RED\\\\Witcher\\\\Settings] 1\n' + '"TextLanguage"="3"\n"VoiceLanguage"="3"\n') + return __import__('subprocess').CompletedProcess(argv, 0) + with patch.object(store.subprocess, 'run', side_effect=run): + self.assertEqual('written=6', store.apply_gog_registry(folder, str(data), str(proton))) + self.assertEqual('none', store.apply_gog_registry(folder, str(data), str(proton))) + (pfx / 'system.reg').write_text( + '[Software\\\\Wow6432Node\\\\CD Projekt Red\\\\The Witcher] 1\n' + '"RegionVersion"="US"\n"IsDjinniInstalled"=dword:00000001\n"Language"="3"\n') + self.assertEqual('written=1', store.apply_gog_registry(folder, str(data), str(proton))) + self.assertEqual(2, len(imported)) + + def test_the_install_language_selects_the_titles_language_id(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['pl-PL']})) + entries, _ = store.gog_registry(folder) + self.assertIn('"Language"="5"', entries[3]) + + def test_a_script_that_sets_registry_keeps_its_own_values(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='gog', ident='1207658924') + (folder / 'goggame-1207658924.info').write_text(json.dumps({'languages': ['en-US']})) + gog_script(folder, '1207658924', [ + set_registry(root='HKLM', subkey='Software\\CD Projekt Red\\The Witcher', + valueName='InstallFolder', valueData='{app}\\', valueType='string'), + ]) + entries, _ = store.gog_registry(folder) + app = store.windows_path(str(folder)).replace('\\', '\\\\') + self.assertEqual([ + '[HKEY_LOCAL_MACHINE\\Software\\CD Projekt Red\\The Witcher]\r\n"InstallFolder"="%s\\\\"' % app, + ], entries) + def test_a_game_without_a_script_starts_without_proton(self): with tempfile.TemporaryDirectory() as root: folder = game(root, store_id='gog') diff --git a/tools/tests/test_webhelper_preload.py b/tools/tests/test_webhelper_preload.py index 30a41fc7bd..7c49e1d765 100644 --- a/tools/tests/test_webhelper_preload.py +++ b/tools/tests/test_webhelper_preload.py @@ -61,6 +61,19 @@ class WebhelperPreloadTest(unittest.TestCase): args = [WEBHELPER, "--enable-features=A"] self.assertEqual(self.argv(*args, spec="stock"), args) + def test_angle_switches_are_appended_with_the_gpu_process_kept_out_of_process(self): + out = self.argv(WEBHELPER, "-lang=en_US", "--enable-features=A", spec="--use-gl=angle --use-angle=vulkan") + self.assertEqual(out, [WEBHELPER, "-lang=en_US", "--use-gl=angle", "--use-angle=vulkan", + "--enable-features=A"]) + self.assertNotIn("--in-process-gpu", out) + + def test_vulkan_compositing_features_join_steams_feature_list(self): + out = self.argv(WEBHELPER, "--enable-features=PlatformHEVCDecoderSupport,V4L2VideoDecode", + spec="--use-gl=angle --use-angle=vulkan +Vulkan +VulkanFromANGLE +DefaultANGLEVulkan") + self.assertEqual(out, [WEBHELPER, "--use-gl=angle", "--use-angle=vulkan", + "--enable-features=PlatformHEVCDecoderSupport,V4L2VideoDecode," + "Vulkan,VulkanFromANGLE,DefaultANGLEVulkan"]) + def test_an_empty_setting_means_the_default(self): self.assertIn("--no-zygote", self.argv(WEBHELPER, spec="")) diff --git a/tools/ubuntu/README.md b/tools/ubuntu/README.md index ceea395c55..85001fe67a 100644 --- a/tools/ubuntu/README.md +++ b/tools/ubuntu/README.md @@ -29,7 +29,8 @@ Steam on the desktop). The app installs it into `files/linuxfs` and runs it unde - The desktop pack's `usr/share/droiddeck/desktop/files.tsv.gz` lists each path the desktop added (N), changed (C) or removed (R), and `originals/` keeps the runtime's copies of changed and removed files. Removing the desktop restores those and deletes the added files the user has not changed; - a runtime update replaces the tree, and the desktop is downloaded again when it is next opened. + a runtime update replaces the tree, so when the desktop was installed the update installs the new + runtime's desktop pack right after it. At run time: